更新后续工序作业

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -1182,9 +1182,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             // 获取排程参数设置
             List<ApsScheduleConfigDo> apsConfigs = apsScheduleConfigService.list();
             BigDecimal aluminumdensity = apsConfigs.get(0).getAluminumdensity();
-
-            ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(params.getBlankid());
-            String craftrouteid = apsBlankOrderDo.getCraftrouteid();
             //该坯料计划所有的工序及输出
             Map<String, Object> map = new HashMap<>();
             map.put("BLANKID", params.getBlankid());
@@ -1343,12 +1340,13 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 if (operationOutMaterDos.size() > 0) {
                     ResetProcessOperationVo resetmap = new ResetProcessOperationVo();
                     resetmap.setBlankid(params.getBlankid());
+                    resetmap.setCraftrouteid(params.getCraftrouteid());
                     resetmap.setOutmeterinfo(operationOutMaterDos);
                     resetProcessOperation(resetmap);
                 }
             }
             //更新坯料计划的所选工艺路线相关信息
-            ApsCraftRouteDo apsCraftRouteDo = apsCraftRouteService.getById(craftrouteid);
+            ApsCraftRouteDo apsCraftRouteDo = apsCraftRouteService.getById(params.getCraftrouteid());
             R r = new R();
             r.setCode("200");
             r.setData(apsCraftRouteDo);
@@ -1612,6 +1610,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             if (operationOutMaterDos.size() > 0) {
                 ResetProcessOperationVo resetmap = new ResetProcessOperationVo();
                 resetmap.setBlankid(blanckdata.getStr("ID"));
+                resetmap.setCraftrouteid(blanckdata.getStr("CRAFTROUTEID"));
                 resetmap.setOutmeterinfo(operationOutMaterDos);
                 resetProcessOperation(resetmap);
             }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ResetProcessOperationVo.java

@@ -9,6 +9,8 @@ import java.util.List;
 public class ResetProcessOperationVo {
     //坯料计划ID
     private String blankid;
+    //工艺路线D
+    private String craftrouteid;
     //修改得作业输出
     private List<ApsProcessOperationOutMaterDo> outmeterinfo;
 }