schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28219 from DeeMysterio/in-process-qi

Browse Source 
feat: provision to have limited parameters for in-process quality inspection
This commit is contained in:
rohitwaghchaure
2021-11-09 15:49:37 +05:30
committed by GitHub
parent 59632720b2 467324c87f
commit 8079dc1bae
5 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/manufacturing/doctype/job_card/job_card.js
View File

@@ -70,6 +70,23 @@ frappe.ui.form.on('Job Card', {
&& (frm.doc.items || !frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty)) {
frm.trigger("prepare_timer_buttons");
}
frm.trigger("setup_quality_inspection");
},
setup_quality_inspection: function(frm) {
let quality_inspection_field = frm.get_docfield("quality_inspection");
quality_inspection_field.get_route_options_for_new_doc = function(frm) {
return {
"inspection_type": "In Process",
"reference_type": "Job Card",
"reference_name": frm.doc.name,
"item_code": frm.doc.production_item,
"item_name": frm.doc.item_name,
"item_serial_no": frm.doc.serial_no,
"batch_no": frm.doc.batch_no,
"quality_inspection_template": frm.doc.quality_inspection_template,
};
};
},
setup_corrective_job_card: function(frm) {

10
erpnext/manufacturing/doctype/job_card/job_card.json
View File

@@ -19,6 +19,7 @@
"serial_no",
"column_break_12",
"wip_warehouse",
"quality_inspection_template",
"quality_inspection",
"project",
"batch_no",
@@ -407,11 +408,18 @@
"no_copy": 1,
"options": "Job Card Scrap Item",
"print_hide": 1
},
{
"fetch_from": "operation.quality_inspection_template",
"fieldname": "quality_inspection_template",
"fieldtype": "Link",
"label": "Quality Inspection Template",
"options": "Quality Inspection Template"
}
],
"is_submittable": 1,
"links": [],
"modified": "2021-09-14 00:38:46.873105",
"modified": "2021-11-09 14:07:20.290306",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card",

9
erpnext/manufacturing/doctype/operation/operation.json
View File

@@ -13,6 +13,7 @@
"is_corrective_operation",
"job_card_section",
"create_job_card_based_on_batch_size",
"quality_inspection_template",
"column_break_6",
"batch_size",
"sub_operations_section",
@@ -92,12 +93,18 @@
"fieldname": "is_corrective_operation",
"fieldtype": "Check",
"label": "Is Corrective Operation"
},
{
"fieldname": "quality_inspection_template",
"fieldtype": "Link",
"label": "Quality Inspection Template",
"options": "Quality Inspection Template"
}
],
"icon": "fa fa-wrench",
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-01-12 15:09:23.593338",
"modified": "2021-11-03 13:49:39.114976",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Operation",

2
erpnext/stock/doctype/quality_inspection/quality_inspection.js
View File

@@ -59,7 +59,7 @@ frappe.ui.form.on("Quality Inspection", {
},
item_code: function(frm) {
if (frm.doc.item_code) {
if (frm.doc.item_code && !frm.doc.quality_inspection_template) {
return frm.call({
method: "get_quality_inspection_template",
doc: frm.doc,

9
erpnext/stock/doctype/quality_inspection/quality_inspection.py
View File

@@ -19,6 +19,15 @@ class QualityInspection(Document):
if not self.readings and self.item_code:
self.get_item_specification_details()
if self.inspection_type=="In Process" and self.reference_type=="Job Card":
item_qi_template = frappe.db.get_value("Item", self.item_code, 'quality_inspection_template')
parameters = get_template_details(item_qi_template)
for reading in self.readings:
for d in parameters:
if reading.specification == d.specification:
reading.update(d)
reading.status = "Accepted"
if self.readings:
self.inspect_and_set_status()