Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: provision to have limited parameters for in-process quality ins… #28549

Merged
merged 3 commits into from
Dec 15, 2021
Merged

feat: provision to have limited parameters for in-process quality ins… #28549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b855dc
feat: provision to have limited parameters for in-process quality ins…
DeeMysterio Nov 24, 2021
14d0242
Merge branch 'develop' into dev-in-process-qi
ankush Dec 15, 2021
6abcfda
chore: formatting
ankush Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions erpnext/manufacturing/doctype/job_card/job_card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ frappe.ui.form.on('Job Card', {
frm.trigger("prepare_timer_buttons");
}

frm.trigger("setup_quality_inspection");
if (frm.doc.work_order) {
frappe.db.get_value('Work Order', frm.doc.work_order,
'transfer_material_against').then((r) => {
Expand All @@ -86,6 +87,22 @@ frappe.ui.form.on('Job Card', {
}
},

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) {
frm.add_custom_button(__('Corrective Job Card'), () => {
let operations = frm.doc.sub_operations.map(d => d.sub_operation).concat(frm.doc.operation);
Expand Down
10 changes: 9 additions & 1 deletion erpnext/manufacturing/doctype/job_card/job_card.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"serial_no",
"column_break_12",
"wip_warehouse",
"quality_inspection_template",
"quality_inspection",
"project",
"batch_no",
Expand Down Expand Up @@ -408,11 +409,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-11-12 10:15:03.572401",
"modified": "2021-11-24 19:17:40.879235",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card",
Expand Down
10 changes: 9 additions & 1 deletion erpnext/manufacturing/doctype/operation/operation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -92,15 +93,22 @@
"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-24 19:15:24.357187",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Operation",
"naming_rule": "Set by user",
"owner": "Administrator",
"permissions": [
{
Expand Down
2 changes: 1 addition & 1 deletion erpnext/stock/doctype/quality_inspection/quality_inspection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 9 additions & 0 deletions erpnext/stock/doctype/quality_inspection/quality_inspection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ def validate(self):
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()

Expand Down