Skip to content

Commit

Permalink
refactor: separate table added to track scheduling in the job card
Browse files Browse the repository at this point in the history
  • Loading branch information
rohitwaghchaure committed Jun 29, 2023
1 parent 9a993b0 commit 94524cf
Show file tree
Hide file tree
Showing 10 changed files with 332 additions and 79 deletions.
146 changes: 99 additions & 47 deletions erpnext/manufacturing/doctype/job_card/job_card.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,40 @@
"naming_series",
"work_order",
"bom_no",
"production_item",
"employee",
"column_break_4",
"posting_date",
"company",
"production_section",
"production_item",
"item_name",
"for_quantity",
"serial_and_batch_bundle",
"serial_no",
"column_break_12",
"wip_warehouse",
"quality_inspection_template",
"quality_inspection",
"project",
"batch_no",
"operation_section_section",
"operation",
"operation_row_number",
"column_break_18",
"workstation_type",
"workstation",
"employee",
"section_break_21",
"sub_operations",
"timing_detail",
"total_completed_qty",
"process_loss_qty",
"scheduled_time_section",
"expected_start_date",
"time_required",
"column_break_jkir",
"expected_end_date",
"section_break_05am",
"scheduled_time_logs",
"timing_detail",
"time_logs",
"section_break_13",
"total_completed_qty",
"process_loss_qty",
"column_break_15",
"actual_start_date",
"total_time_in_mins",
"column_break_15",
"actual_end_date",
"production_section",
"operation",
"wip_warehouse",
"column_break_12",
"workstation_type",
"workstation",
"quality_inspection_section",
"quality_inspection_template",
"column_break_fcmp",
"quality_inspection",
"section_break_21",
"sub_operations",
"section_break_8",
"items",
"scrap_items_section",
Expand All @@ -53,18 +54,25 @@
"hour_rate",
"for_operation",
"more_information",
"operation_id",
"sequence_id",
"project",
"item_name",
"transferred_qty",
"requested_qty",
"status",
"column_break_20",
"operation_row_number",
"operation_id",
"sequence_id",
"remarks",
"serial_and_batch_bundle",
"batch_no",
"serial_no",
"barcode",
"job_started",
"started_time",
"current_time",
"amended_from"
"amended_from",
"connections_tab"
],
"fields": [
{
Expand Down Expand Up @@ -134,7 +142,7 @@
{
"fieldname": "timing_detail",
"fieldtype": "Section Break",
"label": "Timing Detail"
"label": "Actual Time"
},
{
"allow_bulk_edit": 1,
Expand Down Expand Up @@ -167,7 +175,7 @@
},
{
"fieldname": "section_break_8",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Raw Materials"
},
{
Expand All @@ -179,7 +187,7 @@
{
"collapsible": 1,
"fieldname": "more_information",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "More Information"
},
{
Expand Down Expand Up @@ -264,10 +272,9 @@
"reqd": 1
},
{
"collapsible": 1,
"fieldname": "production_section",
"fieldtype": "Section Break",
"label": "Production"
"fieldtype": "Tab Break",
"label": "Operation & Workstation"
},
{
"fieldname": "column_break_12",
Expand Down Expand Up @@ -331,19 +338,11 @@
"options": "Job Card Operation",
"read_only": 1
},
{
"fieldname": "operation_section_section",
"fieldtype": "Section Break",
"label": "Operation Section"
},
{
"fieldname": "column_break_18",
"fieldtype": "Column Break"
},
{
"fieldname": "section_break_21",
"fieldtype": "Section Break",
"hide_border": 1
"fieldtype": "Tab Break",
"hide_border": 1,
"label": "Sub Operations"
},
{
"depends_on": "is_corrective_job_card",
Expand All @@ -355,7 +354,7 @@
"collapsible": 1,
"depends_on": "is_corrective_job_card",
"fieldname": "corrective_operation_section",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Corrective Operation"
},
{
Expand Down Expand Up @@ -408,7 +407,7 @@
{
"collapsible": 1,
"fieldname": "scrap_items_section",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Scrap Items"
},
{
Expand Down Expand Up @@ -451,15 +450,68 @@
"print_hide": 1
},
{
"depends_on": "process_loss_qty",
"fieldname": "process_loss_qty",
"fieldtype": "Float",
"label": "Process Loss Qty",
"read_only": 1
},
{
"fieldname": "connections_tab",
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
},
{
"fieldname": "scheduled_time_section",
"fieldtype": "Section Break",
"label": "Scheduled Time"
},
{
"fieldname": "column_break_jkir",
"fieldtype": "Column Break"
},
{
"fieldname": "time_required",
"fieldtype": "Float",
"label": "Expected Time Required (In Mins)"
},
{
"fieldname": "section_break_05am",
"fieldtype": "Section Break"
},
{
"fieldname": "scheduled_time_logs",
"fieldtype": "Table",
"label": "Scheduled Time Logs",
"options": "Job Card Scheduled Time",
"read_only": 1
},
{
"fieldname": "actual_start_date",
"fieldtype": "Datetime",
"label": "Actual Start Date",
"read_only": 1
},
{
"fieldname": "actual_end_date",
"fieldtype": "Datetime",
"label": "Actual End Date",
"read_only": 1
},
{
"fieldname": "quality_inspection_section",
"fieldtype": "Section Break",
"label": "Quality Inspection"
},
{
"fieldname": "column_break_fcmp",
"fieldtype": "Column Break"
}
],
"is_submittable": 1,
"links": [],
"modified": "2023-06-09 12:04:55.534264",
"modified": "2023-06-28 19:23:14.345214",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card",
Expand Down
Loading

0 comments on commit 94524cf

Please sign in to comment.