|
|
@@ -128,7 +128,7 @@ public class YidaServiceImpl implements YidaService {
|
|
|
System.out.println("【制作新订单】子表单【系列套数】");
|
|
|
String codeSeries;
|
|
|
String nameSeries;
|
|
|
- int numOfSetsSeries;
|
|
|
+ int numOfSetsSeries; //套数
|
|
|
for(Map orderSubRecordSeries : orderSubDataSeries){ //遍历子表单记录
|
|
|
codeSeries = UtilMap.getString(orderSubRecordSeries,"textField_mizmmf8m"); // 系列编号【系列套数】
|
|
|
nameSeries = UtilMap.getString(orderSubRecordSeries,"textField_mesc7nvf"); // 系列【系列套数】
|
|
|
@@ -139,7 +139,7 @@ public class YidaServiceImpl implements YidaService {
|
|
|
System.out.println("【制作新订单】子表单【语言版本 - 数量拆分】");
|
|
|
String codeLang;
|
|
|
String nameLang;
|
|
|
- int numOfSetsAll;
|
|
|
+ int numOfSetsAll; //总套数
|
|
|
for(Map orderSubRecordLang : orderSubDataLang){ //遍历子表单记录
|
|
|
codeSeries = UtilMap.getString(orderSubRecordLang,"textField_mizmmf8h"); // 系列编号【语言版本 - 数量拆分】
|
|
|
nameSeries = UtilMap.getString(orderSubRecordLang,"textField_meqqj4wa"); // 系列【语言版本 - 数量拆分】
|
|
|
@@ -383,13 +383,13 @@ public class YidaServiceImpl implements YidaService {
|
|
|
【配件任务表】 FORM-B9CBFB34DB3249C483415EF641202AC199J9
|
|
|
*/
|
|
|
System.out.println("保存配件任务数据("+projectPhase+"):"+ JSONObject.toJSONString(partsTaskData));
|
|
|
- ydClient.operateData(
|
|
|
- YDParam.builder()
|
|
|
- .formUuid(EastarParam.YD_FORMUUID_CGTASK)
|
|
|
- .formDataJson(JSONObject.toJSONString(partsTaskData))
|
|
|
- .build(),
|
|
|
- YDConf.FORM_OPERATION.create
|
|
|
- );
|
|
|
+// ydClient.operateData(
|
|
|
+// YDParam.builder()
|
|
|
+// .formUuid(EastarParam.YD_FORMUUID_CGTASK)
|
|
|
+// .formDataJson(JSONObject.toJSONString(partsTaskData))
|
|
|
+// .build(),
|
|
|
+// YDConf.FORM_OPERATION.create
|
|
|
+// );
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -401,6 +401,31 @@ public class YidaServiceImpl implements YidaService {
|
|
|
savePartsPackTaskData(null, orderSubDataLang, projectData, projectName, projectCode, leadsCode, projectDataAssOrder, supplierBuyerMap, seriesDevNumMap);
|
|
|
}
|
|
|
|
|
|
+ /*
|
|
|
+ 更新【制作新订单】子表单【语言版本 - 数量拆分】的总套数
|
|
|
+ */
|
|
|
+ List<Map> orderSubDataLangNew = new ArrayList<>();
|
|
|
+ for(Map orderSubRecordLang : orderSubDataLang){ //遍历子表单记录
|
|
|
+ nameSeries = UtilMap.getString(orderSubRecordLang,"textField_meqqj4wa"); // 系列【语言版本 - 数量拆分】
|
|
|
+ numOfSetsSeries = UtilMap.getInt(orderSubRecordLang,"numberField_meqqj4wd"); // 套数【语言版本 - 数量拆分】
|
|
|
+ numOfSetsAll = 0;
|
|
|
+ devNum = seriesDevNumMap.get(nameSeries);
|
|
|
+ if(StringUtils.isNotEmpty(devNum)){
|
|
|
+ numOfSetsAll = numOfSetsSeries + Integer.parseInt(devNum); // 总套数【语言版本 - 数量拆分】,总套数=套数+研发部订单数量,立项完成自动更新总套数
|
|
|
+ }
|
|
|
+ orderSubRecordLang.put("numberField_mmtymctd",numOfSetsAll);
|
|
|
+ orderSubDataLangNew.add(orderSubRecordLang);
|
|
|
+ }
|
|
|
+ System.out.println("更新【制作新订单】数据:"+ JSONObject.toJSONString(orderSubDataLangNew));
|
|
|
+ ydClient.operateData(
|
|
|
+ YDParam.builder()
|
|
|
+ .formInstId(orderId)
|
|
|
+ .updateFormDataJson(
|
|
|
+ JSONObject.toJSONString(UtilMap.map("tableField_meqqj4we",orderSubDataLangNew))
|
|
|
+ ).build(),
|
|
|
+ YDConf.FORM_OPERATION.update
|
|
|
+ );
|
|
|
+
|
|
|
return Collections.emptyMap();
|
|
|
}
|
|
|
|
|
|
@@ -613,13 +638,13 @@ public class YidaServiceImpl implements YidaService {
|
|
|
}
|
|
|
partsTaskData.put("textField_mmikzhlb","包装"); //里程碑
|
|
|
System.out.println("保存配件任务数据(包装):"+ JSONObject.toJSONString(partsTaskData));
|
|
|
- ydClient.operateData(
|
|
|
- YDParam.builder()
|
|
|
- .formUuid(EastarParam.YD_FORMUUID_CGTASK)
|
|
|
- .formDataJson(JSONObject.toJSONString(partsTaskData))
|
|
|
- .build(),
|
|
|
- YDConf.FORM_OPERATION.create
|
|
|
- );
|
|
|
+// ydClient.operateData(
|
|
|
+// YDParam.builder()
|
|
|
+// .formUuid(EastarParam.YD_FORMUUID_CGTASK)
|
|
|
+// .formDataJson(JSONObject.toJSONString(partsTaskData))
|
|
|
+// .build(),
|
|
|
+// YDConf.FORM_OPERATION.create
|
|
|
+// );
|
|
|
}
|
|
|
|
|
|
return null;
|