Jelajahi Sumber

更新后续工序作业

DLC 1 tahun lalu
induk
melakukan
55ca8b9bec

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

@@ -1182,6 +1182,12 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             // 获取排程参数设置
             List<ApsScheduleConfigDo> apsConfigs = apsScheduleConfigService.list();
             BigDecimal aluminumdensity = apsConfigs.get(0).getAluminumdensity();
+
+            String craftrouteid = params.getCraftrouteid();
+            if (craftrouteid.isEmpty()) {
+                ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(params.getBlankid());
+                craftrouteid = apsBlankOrderDo.getCraftrouteid();
+            }
             //该坯料计划所有的工序及输出
             Map<String, Object> map = new HashMap<>();
             map.put("BLANKID", params.getBlankid());
@@ -1340,7 +1346,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 if (operationOutMaterDos.size() > 0) {
                     ResetProcessOperationVo resetmap = new ResetProcessOperationVo();
                     resetmap.setBlankid(params.getBlankid());
-                    resetmap.setCraftrouteid(params.getCraftrouteid());
+                    resetmap.setCraftrouteid(craftrouteid);
                     resetmap.setOutmeterinfo(operationOutMaterDos);
                     resetProcessOperation(resetmap);
                 }