Explorar o código

废弃总采购数量字段,总采购数量赋值给原来的工厂采购数量字段

lvjs hai 1 mes
pai
achega
a95d848cf6

+ 6 - 5
src/main/java/com/malk/eastar/service/impl/EastarTbServiceImpl.java

@@ -336,7 +336,8 @@ public class EastarTbServiceImpl  implements EastarTbService {
                            }
                            //计算总采购数量 add by Jason 20260320 end
                            Map<String, Object> copiedMap = new HashMap<>(map); // 关键:创建副本
-                           copiedMap.put("numberField_mmmwu4ci",allSupplyNum);    //总采购数量 add by Jason 20260320
+                           copiedMap.put("numberField_mmmwu4ci",0);    //总采购数量(废弃) add by Jason 20260320 edit by Jason 20260327
+                           copiedMap.put("numberField_mifp03el",allSupplyNum);   //工厂采购数量 add by Jason 20260327
                            copiedMap.put("dateField_mizvc5oi", planTimestamp);
                            modifiedList.add(copiedMap);
                        } else{
@@ -352,7 +353,7 @@ public class EastarTbServiceImpl  implements EastarTbService {
                            copiedMap.put("numberField_mkosp94h", demoValue);
                            copiedMap.put("numberField_mifp03el", demoValue);
                            copiedMap.put("numberField_mmmwu4cg",0);    //研发部订单需求数量 add by Jason 20260320
-                           copiedMap.put("numberField_mmmwu4ci",demoValue);    //总采购数量 add by Jason 20260320
+                           copiedMap.put("numberField_mmmwu4ci",0);    //总采购数量(废弃) add by Jason 20260320 edit by Jason 20260327
                            modifiedList.add(copiedMap);
                        }
                    }
@@ -453,15 +454,15 @@ public class EastarTbServiceImpl  implements EastarTbService {
             Map packTask = UtilMap.map(
                     "textField_mecmytpr, textField_mifp03eo, textField_mjr129o4, selectField_me2f7tw4, numberField_mkosp94h, numberField_mifp03el, " +
                             "numberField_mmmwu4cg, " + //研发部订单需求数量 add by Jason 20260312
-                            "numberField_mmmwu4ci, ", //总采购数量 add by Jason 20260312
+                            "numberField_mmmwu4ci, ", //总采购数量(废弃) add by Jason 20260312 edit by Jason 20260327
                     UtilMap.getString(orderMap, "textField_mizmmf8k"),
                     UtilMap.getString(orderMap, "textField_mizmmf8j"),
                     UtilMap.getString(orderMap, "textField_meqqj4wb"),
                     UtilMap.getString(orderMap, "textField_meqqj4wa"),
                     setsValue,
-                    setsValue,
+                    allSupplyNum,   //工厂采购数量 edit by Jason 20260327
                     devNum, //研发部订单需求数量 add by Jason 20260320
-                    allSupplyNum //总采购数量 add by Jason 20260320
+                    0 //总采购数量(废弃) add by Jason 20260320 edit by Jason 20260327
 
             );
             packOrderData.computeIfAbsent(supplier, k -> new ArrayList<>()).add(packTask);

+ 8 - 5
src/main/java/com/malk/eastar/service/impl/YidaServiceImpl.java

@@ -64,7 +64,9 @@ public class YidaServiceImpl implements YidaService {
                 YDConf.FORM_QUERY.retrieve_id
         ).getFormData();    //【立项/项目台账】数据,旧变量名 -> data
         String projectCode = UtilMap.getString(projectData,"textField_me2hyldc");  // 项目编号,旧变量名 -> pId
+        System.out.println("项目编码:"+projectCode);
         String projectName = UtilMap.getString(projectData,"textField_me87x1nz");    // 项目名称,旧变量名 -> pName
+        System.out.println("项目名称:"+projectName);
         //String pTaskType = UtilMap.getString(projectData,"textField_mfqnsa9d");    // TB任务类型名称
         String customerName = UtilMap.getString(projectData,"textField_me87x1o0");  // 客户名称,旧变量名 -> merName
         System.out.println("客户名称:"+customerName);
@@ -323,7 +325,8 @@ public class YidaServiceImpl implements YidaService {
                                 }
                             }
                             partsRecordNew = new HashMap<>(partsRecord); // 关键:创建副本
-                            partsRecordNew.put("numberField_mmmwu4ci",allSupplyNum);    //总采购数量
+                            partsRecordNew.put("numberField_mmmwu4ci",0);    //总采购数量(废弃)
+                            partsRecordNew.put("numberField_mifp03el",allSupplyNum);   //工厂采购数量
                             partsRecordNew.put("dateField_mizvc5oi", projectPhasePlanEndTime); //考核日期
                             partsTaskSubDataNew.add(partsRecordNew);
                         } else{
@@ -339,7 +342,7 @@ public class YidaServiceImpl implements YidaService {
                             partsRecordNew.put("numberField_mkosp94h", sampleNum);   //客户订单数量
                             partsRecordNew.put("numberField_mifp03el", sampleNum);   //工厂采购数量
                             partsRecordNew.put("numberField_mmmwu4cg",0);    //研发部订单需求数量
-                            partsRecordNew.put("numberField_mmmwu4ci",sampleNum);    //总采购数量
+                            partsRecordNew.put("numberField_mmmwu4ci",0);    //总采购数量(废弃)
                             partsTaskSubDataNew.add(partsRecordNew);
                         }
                     }
@@ -610,15 +613,15 @@ public class YidaServiceImpl implements YidaService {
                             "numberField_mkosp94h, " +  //客户订单数量
                             "numberField_mifp03el, " +  //工厂采购数量
                             "numberField_mmmwu4cg, " + //研发部订单需求数量
-                            "numberField_mmmwu4ci, ", //总采购数量
+                            "numberField_mmmwu4ci, ", //总采购数量(废弃)
                     UtilMap.getString(orderSubRecordLang, "textField_mizmmf8k"),    //成品名称
                     UtilMap.getString(orderSubRecordLang, "textField_mizmmf8j"),    //成品编号
                     UtilMap.getString(orderSubRecordLang, "textField_meqqj4wb"),    //语言
                     nameSeries,    //系列
                     numOfSets,
-                    numOfSets,
+                    allSupplyNum,   //工厂采购数量
                     devNum, //研发部订单需求数量
-                    allSupplyNum //总采购数量
+                    0 //总采购数量(废弃)
 
             );
             partsRecordListBySupplier.computeIfAbsent(supplier, k -> new ArrayList<>()).add(partsRecord);