From 6cdbdfdf6b085dd9743f225e1d4c0e0555442a6a Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Wed, 3 Aug 2022 11:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedata/master/wql/QMD_ME_MATERIAL.wql | 3 +- .../service/impl/AutoformulaServiceImpl.java | 96 +++++++++++ .../pf/service/impl/FormulaServiceImpl.java | 162 +++++++++++++++++- .../service/impl/InitformulaServiceImpl.java | 96 +++++++++++ .../org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql | 26 +++ .../wms/pdm/produce/workorder/AddDialog.vue | 5 +- mes/qd/src/views/wms/pf/formula/DivDialog.vue | 10 +- .../src/views/wms/pf/formula/ViewDialog.vue | 9 +- .../views/wms/pf/initformula/DivDialog.vue | 12 +- 9 files changed, 407 insertions(+), 12 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql index f869ee48..9f2badb2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql @@ -50,7 +50,8 @@ unit_name, producmaterialext.standard_weight, unit_name as base_unit_id_name, - producmaterialext.product_series + producmaterialext.product_series, + producmaterialext.standard_weight_pft FROM md_me_materialbase mb LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java index 1750a679..af25961d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java @@ -329,6 +329,38 @@ public class AutoformulaServiceImpl implements AutoformulaService { //更新含碳比 jo.put("is_tan",value); } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料 //如果该物料是钴粉 jo.put("is_09030102","100"); @@ -393,6 +425,38 @@ public class AutoformulaServiceImpl implements AutoformulaService { //更新含碳比 jo.put("is_tan",value); } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料 //如果该物料是钴粉 jo.put("is_09030102","100"); @@ -2667,6 +2731,38 @@ public class AutoformulaServiceImpl implements AutoformulaService { //更新含碳比 jo.put("is_tan",value); } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料 //如果该物料是钴粉 jo.put("is_09030102","100"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 4aae103d..b6908112 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -296,8 +296,104 @@ public class FormulaServiceImpl implements FormulaService { .addParam("bucket_type",Formula.getString("bucket_type")) .addParam("flag","4") .process().getResultJSONArray(0); + + JSONArray dtl_new = new JSONArray(); + for(int i=0;i bomdlts_map = new HashMap(); + bomdlts_map.put("09030102",0.0); + bomdlts_map.put("CXJ001",0.0); + bomdlts_map.put("CXJ003",0.0); + bomdlts_map.put("CXJ004",0.0); + bomdlts_map.put("CXJ005",0.0); + bomdlts_map.put("CXJ006",0.0); + bomdlts_map.put("CXJ007",0.0); + bomdlts_map.put("CXJ008",0.0); + bomdlts_map.put("CXJ002",0.0); + for(int j=0;j{ + if(bomdlts2_now>0){ + jo.put("is_"+key,bomdlts2_now+""); + } + }); + }else if(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.THW.getClass_idStr().contains(material_type_id)){//碳化钨新料 + //获取碳含量 + JSONObject FactoryWarranty = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","3") + .process() + .uniqueResult(0); + if(FactoryWarranty==null){ + jo.put("is_tan","0"); + }else{ + //含碳比 + double value = FactoryWarranty.getDouble("value"); + //更新含碳比 + jo.put("is_tan",value); + } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } + }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料 + //如果该物料是钴粉 + jo.put("is_09030102","100"); + }else if(MaterOptTypeEnum.TF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.TF.getClass_idStr().contains(material_type_id))){//C粉新料 + //如果该物料是c粉 + jo.put("is_tan","100"); + } + dtl_new.add(jo); + } JSONObject result = new JSONObject(); - result.put("tableDtl",dtl); + result.put("tableDtl",dtl_new); result.put("material",Formula); return result; } @@ -376,6 +472,38 @@ public class FormulaServiceImpl implements FormulaService { //更新含碳比 jo.put("is_tan",value); } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料 //如果该物料是钴粉 jo.put("is_09030102","100"); @@ -449,6 +577,38 @@ public class FormulaServiceImpl implements FormulaService { //更新含碳比 jo.put("is_tan",value); } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料 //如果该物料是钴粉 jo.put("is_09030102","100"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java index e148f7be..4b461702 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java @@ -69,6 +69,38 @@ public class InitformulaServiceImpl implements InitformulaService { //更新含碳比 jo.put("is_tan",value); } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id)){ //如果该物料是钴粉 jo.put("is_09030102","100"); @@ -922,6 +954,38 @@ public class InitformulaServiceImpl implements InitformulaService { //更新含碳比 jo.put("is_tan",value); } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料 //如果该物料是钴粉 jo.put("is_09030102","100"); @@ -995,6 +1059,38 @@ public class InitformulaServiceImpl implements InitformulaService { //更新含碳比 jo.put("is_tan",value); } + //获取碳化铬 + JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00021") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty2==null){ + jo.put("is_CJZB00021","0"); + }else{ + //含碳比 + double value = FactoryWarranty2.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00021",value); + } + //获取碳化钒 + JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01") + .addParam("material_id",jo.getString("material_id")) + .addParam("dtlmaterial_id","CJZB00020") + .addParam("pcsn",jo.getString("pcsn")) + .addParam("flag","33") + .process() + .uniqueResult(0); + if(FactoryWarranty3==null){ + jo.put("is_CJZB00020","0"); + }else{ + //含碳比 + double value = FactoryWarranty3.getDouble("value"); + //更新含碳比 + jo.put("is_CJZB00020",value); + } }else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料 //如果该物料是钴粉 jo.put("is_09030102","100"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql index e67d2b92..d4a501f7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql @@ -17,6 +17,7 @@ 输入.quality_scode TYPEAS s_string 输入.prior_level TYPEAS s_string 输入.material_id TYPEAS s_string + 输入.dtlmaterial_id TYPEAS s_string 输入.material_code TYPEAS s_string 输入.is_need_manage TYPEAS s_string 输入.formingtype_id TYPEAS s_string @@ -223,6 +224,31 @@ ENDQUERY ENDIF + IF 输入.flag = "33" + QUERY + SELECT + FactoryWarrantyDtl.* + FROM + QL_TEST_FactoryWarrantyMst FactoryWarrantyMst + LEFT JOIN QL_TEST_FactoryWarrantyDtl FactoryWarrantyDtl ON FactoryWarrantyDtl.inspection_id = FactoryWarrantyMst.inspection_id + LEFT JOIN ql_test_inspectionitempoint inspectionitempoint ON inspectionitempoint.inspection_item_id = FactoryWarrantyDtl.inspection_item_id + WHERE + 1 = 1 + AND FactoryWarrantyMst.is_delete = '0' + AND FactoryWarrantyMst.bill_status = '99' + OPTION 输入.dtlmaterial_id <> "" + inspectionitempoint.inspection_item_code = 输入.dtlmaterial_id + ENDOPTION + OPTION 输入.material_id <> "" + FactoryWarrantyMst.material_id = 输入.material_id + ENDOPTION + OPTION 输入.pcsn <> "" + FactoryWarrantyMst.pcsn = 输入.pcsn + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + IF 输入.flag = "4" QUERY SELECT diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue b/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue index f0377652..5705655f 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue @@ -125,8 +125,8 @@ import CRUD, { crud, form } from '@crud/crud' import DeviceDialog from '@/views/wms/pub/DeviceDialog' import MaterDialog from '@/views/wms/pub/MaterDialog' -import workorder from "@/api/wms/pdm/workorder" -import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute"; +import workorder from '@/api/wms/pdm/workorder' +import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute' const defaultForm = { workorder_code: '', @@ -243,6 +243,7 @@ export default { this.form.qty_unit_id = row.base_unit_id this.form.qty_unit_name = row.base_unit_id_name this.form.pcsn = '' + this.form.workorder_qty = row.standard_weight_pft }, storChange(row) { this.form.pcsn = '' diff --git a/mes/qd/src/views/wms/pf/formula/DivDialog.vue b/mes/qd/src/views/wms/pf/formula/DivDialog.vue index 45379e50..86ffbe75 100644 --- a/mes/qd/src/views/wms/pf/formula/DivDialog.vue +++ b/mes/qd/src/views/wms/pf/formula/DivDialog.vue @@ -302,6 +302,8 @@ + +