修改

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

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");

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<dtl.size();i++){
+            JSONObject jo = dtl.getJSONObject(i);
+            String material_type_id = jo.getString("material_type_id");
+            //成型剂
+            if (StrUtil.isNotEmpty(jo.getString("formingtype_code"))) {
+                jo.put("is_"+jo.getString("formingtype_code"),"100");
+            }else if(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(material_type_id)){//软废
+                String jo_material_id = jo.getString("material_id");
+                JSONArray bomdlts = WQL.getWO("QPF_AUTOFORMULA01")
+                        .addParam("material_id",jo_material_id)
+                        .addParam("flag","1")
+                        .process().getResultJSONArray(0);
+                //各成型剂需配总量
+                HashMap<String,Double> bomdlts_map = new HashMap<String,Double>();
+                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<bomdlts.size();j++){
+                    JSONObject bomdtl = bomdlts.getJSONObject(j);
+                    String formingtype_code = bomdtl.getString("formingtype_code");
+                    if( bomdtl.getString("class_code").equals("09030102")){
+                        bomdlts_map.put("09030102",bomdlts_map.get("09030102")+bomdtl.getDouble("standard_rate"));
+                    }else if(bomdlts_map.containsKey(formingtype_code)){
+                        bomdlts_map.put(formingtype_code,bomdlts_map.get(formingtype_code)+bomdtl.getDouble("standard_rate"));
+                    }
+                }
+                bomdlts_map.forEach((key,bomdlts2_now)->{
+                    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");

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");

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

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 workorder from '@/api/wms/pdm/workorder'
-import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
+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 = ''

mes/qd/src/views/wms/pf/formula/DivDialog.vue

@@ -302,6 +302,8 @@
         <el-table-column prop="is_CXJ006" label="白油" align="center" width="80px" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="is_CXJ007" label="油酸" align="center" width="80px" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="is_CXJ008" label="8号分散剂" align="center" width="80px" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="is_CJZB00021" label="碳化铬%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="is_CJZB00020" label="碳化钒%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
         <el-table-column align="center" label="操作" width="270" fixed="right">
           <template scope="scope">
             <el-button :disabled="scope.row.edit || scope.row.status!='10'" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index,tableDtl)" />
@@ -794,7 +796,7 @@ export default {
             }
           }
           if (!this.flagnow) {
-            const row = { edit: false, status:'10', is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',
+            const row = { edit: false, status:'10', is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',is_CJZB00021: '',is_CJZB00020: '',
               material_name: '', pcsn: '', quality_scode: '',need_sum_qty:'0', ivt_level: '', is_active: '', formula_qty: '0', sum_ivt_qty: '', is_need_move: '', is_need_manage: '1', is_add: '1', is_tan: '', is_09030102: '', qty_unit_id: '', qty_unit_name: '' }
             row.material_id = item.material_id
             row.quality_scode = item.quality_scode
@@ -820,10 +822,12 @@ export default {
             row.is_need_move = item.is_need_move
             row.qty_unit_id = item.qty_unit_id
             row.qty_unit_name = item.qty_unit_name
+            row.is_CJZB00020 = item.is_CJZB00020
+            row.is_CJZB00021 = item.is_CJZB00021
             tablemap.set(item.material_id+"--"+item.quality_scode+"--"+item.pcsn+"--"+item.is_active+"--"+item.ivt_level, row)
           }
         } else {
-          const row = { edit: false, status:'10', is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',
+          const row = { edit: false, status:'10', is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',is_CJZB00021: '',is_CJZB00020: '',
             material_name: '', pcsn: '', quality_scode: '',need_sum_qty:'0',  ivt_level: '', is_active: '', formula_qty: '0', sum_ivt_qty: '', is_need_move: '', is_need_manage: '1', is_add: '1', is_tan: '', is_09030102: '', qty_unit_id: '', qty_unit_name: '' }
           row.material_id = item.material_id
           row.quality_scode = item.quality_scode
@@ -849,6 +853,8 @@ export default {
           row.is_need_move = item.is_need_move
           row.qty_unit_id = item.qty_unit_id
           row.qty_unit_name = item.qty_unit_name
+          row.is_CJZB00020 = item.is_CJZB00020
+          row.is_CJZB00021 = item.is_CJZB00021
           tablemap.set(item.material_id+"--"+item.quality_scode+"--"+item.pcsn+"--"+item.is_active+"--"+item.ivt_level, row)
         }
       })

mes/qd/src/views/wms/pf/formula/ViewDialog.vue

@@ -203,6 +203,8 @@
         <el-table-column prop="is_CXJ006" label="白油" align="center" width="100px" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="is_CXJ007" label="油酸" align="center" width="100px" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="is_CXJ008" label="8号分散剂" align="center" width="100px" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="is_CJZB00021" label="碳化铬%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="is_CJZB00020" label="碳化钒%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
       </el-table>
     </el-card>
     <div class="crud-opts2" v-if="form.bucket_type==='02'">
@@ -264,15 +266,16 @@
         <el-table-column prop="is_CXJ006" label="白油" align="center" width="100px" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="is_CXJ007" label="油酸" align="center" width="100px" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="is_CXJ008" label="8号分散剂" align="center" width="100px" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="is_CJZB00021" label="碳化铬%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="is_CJZB00020" label="碳化钒%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
       </el-table>
     </el-card>
   </el-dialog>
 </template>
 
 <script>
-import CRUD, { crud } from '@crud/crud'
+import { crud } from '@crud/crud'
 import formula from '@/api/wms/pf/formula'
-import autoformula from "@/api/wms/pf/autoformula";
 export default {
   name: 'ViewDialog',
   mixins: [crud()],

mes/qd/src/views/wms/pf/initformula/DivDialog.vue

@@ -259,6 +259,8 @@
         <el-table-column prop="is_CXJ006" label="白油" align="center" width="100px" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="is_CXJ007" label="油酸" align="center" width="100px" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="is_CXJ008" label="8号分散剂" align="center" width="100px" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="is_CJZB00021" label="碳化铬%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="is_CJZB00020" label="碳化钒%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
         <el-table-column align="center" label="操作" width="160" fixed="right">
           <template scope="scope">
             <el-button :disabled="!button2" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index,tableDtl)" />
@@ -365,7 +367,7 @@
 </template>
 
 <script>
-import CRUD, { crud } from '@crud/crud'
+import { crud } from '@crud/crud'
 import StructIvt from '@/views/wms/pf/initformula/StructIvt'
 import StructIvt2 from '@/views/wms/pf/initformula/StructIvt2'
 import StructIvt3 from '@/views/wms/pf/initformula/StructIvt3'
@@ -904,7 +906,7 @@ export default {
           if (!this.flagnow) {
             const row = { edit: false,is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',
               material_name: '', pcsn: '', quality_scode: '', ivt_level: '', is_active: '', formula_qty: '0', sum_ivt_qty: '', is_need_move: '', is_need_manage: '1', is_tan: '', is_09030102: '',
-              is_CXJ001: '', is_CXJ003: '',need_sum_qty:'0', is_CXJ004: '',is_CXJ005: '',is_CXJ006: '',is_CXJ007: '',is_CXJ008: '',is_CXJ002: '',
+              is_CXJ001: '', is_CXJ003: '',need_sum_qty:'0', is_CXJ004: '',is_CXJ005: '',is_CXJ006: '',is_CXJ007: '',is_CXJ008: '',is_CXJ002: '',is_CJZB00021: '',is_CJZB00020: '',
               qty_unit_id: '', qty_unit_name: '' }
             row.material_id = item.material_id
             row.quality_scode = item.quality_scode
@@ -929,12 +931,14 @@ export default {
             row.is_CXJ007 = item.is_CXJ007
             row.is_CXJ008 = item.is_CXJ008
             row.is_CXJ002 = item.is_CXJ002
+            row.is_CJZB00020 = item.is_CJZB00020
+            row.is_CJZB00021 = item.is_CJZB00021
             tablemap.set(item.material_id+"--"+item.quality_scode+"--"+item.pcsn+"--"+item.is_active+"--"+item.ivt_level, row)
           }
         } else {
           const row = { edit: false, is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',
             material_name: '', pcsn: '', quality_scode: '', need_sum_qty:'0',ivt_level: '', is_active: '', formula_qty: '0', sum_ivt_qty: '', is_need_move: '', is_need_manage: '1', is_tan: '', is_09030102: '', is_CXJ001: '',
-            is_CXJ003: '',is_CXJ004: '',is_CXJ005: '',is_CXJ006: '',is_CXJ007: '',is_CXJ008: '',is_CXJ002: '',
+            is_CXJ003: '',is_CXJ004: '',is_CXJ005: '',is_CXJ006: '',is_CXJ007: '',is_CXJ008: '',is_CXJ002: '',is_CJZB00021: '',is_CJZB00020: '',
             qty_unit_id: '', qty_unit_name: '' }
           row.material_id = item.material_id
           row.quality_scode = item.quality_scode
@@ -959,6 +963,8 @@ export default {
           row.is_CXJ007 = item.is_CXJ007
           row.is_CXJ008 = item.is_CXJ008
           row.is_CXJ002 = item.is_CXJ002
+          row.is_CJZB00020 = item.is_CJZB00020
+          row.is_CJZB00021 = item.is_CJZB00021
           tablemap.set(item.material_id+"--"+item.quality_scode+"--"+item.pcsn+"--"+item.is_active+"--"+item.ivt_level, row)
         }
       })