Explorar el Código

【立项 / 项目台账】→【配件任务表】数据流转(独立程序)补充“研发部订单需求数量”和“总采购数量”字段

lvjs hace 5 días
padre
commit
3207c534ae

+ 24 - 2
src/main/java/com/malk/eastar/service/impl/EastarTbServiceImpl.java

@@ -18,6 +18,7 @@ import com.malk.service.teambition.TBClient_User;
 import com.malk.utils.PublicUtil;
 import com.malk.utils.UtilMap;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -345,13 +346,18 @@ public class EastarTbServiceImpl  implements EastarTbService {
             String supplier = UtilMap.getString(orderMap, "textField_mkp7yv76");
             String setsValue = UtilMap.getString(orderMap, "numberField_meqqj4wd");
             Map packTask = UtilMap.map(
-                    "textField_mecmytpr, textField_mifp03eo, textField_mjr129o4, selectField_me2f7tw4, numberField_mkosp94h, numberField_mifp03el, numberField_me2f7tw0",
+                    "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_me2f7tw0",
                     UtilMap.getString(orderMap, "textField_mizmmf8k"),
                     UtilMap.getString(orderMap, "textField_mizmmf8j"),
                     UtilMap.getString(orderMap, "textField_meqqj4wb"),
                     UtilMap.getString(orderMap, "textField_meqqj4wa"),
                     setsValue,
                     setsValue,
+                    0, //研发部订单需求数量 add by Jason 20260312
+                    0, //总采购数量 add by Jason 20260312
                     UtilMap.getString(orderMap, "numberField_mkf4bc4j")
             );
             packOrderData.computeIfAbsent(supplier, k -> new ArrayList<>()).add(packTask);
@@ -391,6 +397,7 @@ public class EastarTbServiceImpl  implements EastarTbService {
         if (PublicUtil.isNull(taskMap,"executorId")){
             taskMap.remove("executorId");
         }
+        String rdNum = UtilMap.getString(cgDetail,"numberField_mmke3fdc"); //研发部订单需求数量 add by Jason 20260312
         for(Map map: orderConf){
             Map tMap=new HashMap();
             tMap.putAll(taskMap);
@@ -424,7 +431,22 @@ public class EastarTbServiceImpl  implements EastarTbService {
             log.info("最终任务名称:{},详细参数:{}",tMap.get("content"),tMap);
             Map result=tbTask.createTask(tbConf.getOperatorId(), tMap);// 更新任务所属任务列表
             Map recod=new HashMap(cgDetail);
-            recod.putAll(UtilMap.map("textField_mecmytpr, textField_mecmytps, textField_mecmytpt, numberField_mifp03el, textField_mifp03eo, textField_miib17jx, textField_mizvc5oj, textField_mjr129o4, numberField_mkosp94h",result.get("content"),result.get("taskId"),"未开始",value,sku,pId,result.get("taskId"),lang,value));
+            //计算总采购数量 add by Jason 20260312 start
+            int allSupplyNum = 0;
+            if(StringUtils.isNotEmpty(rdNum) && StringUtils.isNotEmpty(value)){
+                allSupplyNum = Integer.parseInt(rdNum) + Integer.parseInt(value);
+            }
+            //计算总采购数量 add by Jason 20260312 end
+            recod.putAll(
+                    UtilMap.map(
+                            "textField_mecmytpr, textField_mecmytps, textField_mecmytpt, numberField_mifp03el, " +
+                                    "numberField_mmmwu4cg, " + //研发部订单需求数量 add by Jason 20260312
+                                    "numberField_mmmwu4ci, " + //总采购数量 add by Jason 20260312
+                                    "textField_mifp03eo, textField_miib17jx, textField_mizvc5oj, textField_mjr129o4, numberField_mkosp94h",
+                            result.get("content"),result.get("taskId"),"未开始",value,
+                            rdNum, //研发部订单需求数量 add by Jason 20260312
+                            allSupplyNum, //总采购数量 add by Jason 20260312
+                            sku,pId,result.get("taskId"),lang,value));
             recodTable.add(recod);
 //            for (String son:sonconf){
 //                Map sonMap=new HashMap();