|
|
@@ -255,7 +255,7 @@ public class EastarTbServiceImpl implements EastarTbService {
|
|
|
if(isLang){ // 区分语言
|
|
|
result=saveTbTask(taskMap,orderLangConf,map,customfields,isLang,sonconf,sonScenariofieldconfigId,gysName,pId,pMainId,skuIdMap);
|
|
|
}else{
|
|
|
- result=saveTbTask(taskMap,xlConf,map,customfields,isLang,sonconf,sonScenariofieldconfigId,gysName,pId,pMainId,skuIdMap);
|
|
|
+ result=saveTbTask(taskMap,orderLangConf,map,customfields,isLang,sonconf,sonScenariofieldconfigId,gysName,pId,pMainId,skuIdMap);
|
|
|
}
|
|
|
if(gysOrderData.containsKey(gysName)){
|
|
|
gysOrderData.get(gysName).addAll(result);
|
|
|
@@ -348,8 +348,7 @@ 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_me2f7tw0",
|
|
|
+ "numberField_mmmwu4ci, ", //总采购数量 add by Jason 20260312
|
|
|
UtilMap.getString(orderMap, "textField_mizmmf8k"),
|
|
|
UtilMap.getString(orderMap, "textField_mizmmf8j"),
|
|
|
UtilMap.getString(orderMap, "textField_meqqj4wb"),
|
|
|
@@ -357,8 +356,8 @@ public class EastarTbServiceImpl implements EastarTbService {
|
|
|
setsValue,
|
|
|
setsValue,
|
|
|
0, //研发部订单需求数量 add by Jason 20260312
|
|
|
- 0, //总采购数量 add by Jason 20260312
|
|
|
- UtilMap.getString(orderMap, "numberField_mkf4bc4j")
|
|
|
+ 0 //总采购数量 add by Jason 20260312
|
|
|
+
|
|
|
);
|
|
|
packOrderData.computeIfAbsent(supplier, k -> new ArrayList<>()).add(packTask);
|
|
|
}
|
|
|
@@ -442,11 +441,11 @@ public class EastarTbServiceImpl implements EastarTbService {
|
|
|
"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",
|
|
|
+ "textField_mifp03eo, textField_miib17jx, textField_mizvc5oj, textField_mjr129o4, numberField_mkosp94h, numberField_me2f7tw0",
|
|
|
result.get("content"),result.get("taskId"),"未开始",value,
|
|
|
rdNum, //研发部订单需求数量 add by Jason 20260312
|
|
|
allSupplyNum, //总采购数量 add by Jason 20260312
|
|
|
- sku,pId,result.get("taskId"),lang,value));
|
|
|
+ sku,pId,result.get("taskId"),lang,value,UtilMap.getString(map, "numberField_mkf4bc4j")));
|
|
|
recodTable.add(recod);
|
|
|
// for (String son:sonconf){
|
|
|
// Map sonMap=new HashMap();
|