aps-坯料计划排程状态更新逻辑优化

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

@@ -245,6 +245,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     .eq(ApsProcessOperationDo::getProcessstatus, TO_BE_PUBLISHED)
                     .set(ApsProcessOperationDo::getProcessstatus, TO_BE_STARTED)
                     .set(ApsProcessOperationDo::getLockmark, LOCKMARK_Y));
+            //更新坯料计划排程状态为：已发布
+            ApsBlankOrderDo needUpdateBlank = new ApsBlankOrderDo();
+            needUpdateBlank.setId(blankId);
+            needUpdateBlank.setSchedulingstatus(SCHEDULSTATUS_HASRELEASE);
+            apsBlankOrderService.updateById(needUpdateBlank);
             // 工序作业信息
             List<ApsProcessOperationDo> processOperationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
                     .eq(ApsProcessOperationDo::getBlankid, blankId).orderByDesc(ApsProcessOperationDo::getProcessstatus));
@@ -323,6 +328,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     .eq(ApsProcessOperationDo::getBlankid, blankId)
                     .eq(ApsProcessOperationDo::getProcessstatus, TO_BE_STARTED)
                     .set(ApsProcessOperationDo::getProcessstatus, TO_BE_PUBLISHED));
+            //更新坯料计划排程状态为：待发布
+            ApsBlankOrderDo needUpdateBlank = new ApsBlankOrderDo();
+            needUpdateBlank.setId(blankId);
+            needUpdateBlank.setSchedulingstatus(SCHEDULSTATUS_TORELEASE);
+            apsBlankOrderService.updateById(needUpdateBlank);
             // 工序作业信息
             List<ApsProcessOperationDo> processOperationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
                     .eq(ApsProcessOperationDo::getBlankid, blankId).orderByDesc(ApsProcessOperationDo::getProcessstatus));

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

@@ -1510,21 +1510,21 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                         ApsBlankOrderDo blankOrderDo = new ApsBlankOrderDo();
                         blankOrderDo.setId(two.getBlankId());
                         blankOrderDo.setProductstatus(two.getProductionStatus());
-                        //更新坯料计划的排程状态
-                        /**
-                         * 如果生产状态=待排程，则排程状态=待排程
-                         * 如果生产状态=待发布，则排程状态=待发布
-                         * 如果生产状态=待开工或加工中或已完工，则排程状态=已发布
-                         */
-                        if (two.getMinProductionStatus().equals(TO_BE_SCHEDULED)) {
-                            blankOrderDo.setSchedulingstatus(SaveConstans.SchedulingStatus.TO_BE_SCHEDULED);
-                            //存储日志
-                            apsConflictLogService.recordLog("", "更新坯料计划状态为待排程，坯料计划ID为：" + blankOrderDo.getId(), "", 2, null);
-                        } else if (two.getMinProductionStatus().equals(TO_BE_PUBLISHED)) {
-                            blankOrderDo.setSchedulingstatus(SaveConstans.SchedulingStatus.TO_BE_PUBLISHED);
-                        } else {
-                            blankOrderDo.setSchedulingstatus(SaveConstans.SchedulingStatus.PUBLISHED);
-                        }
+//                        //更新坯料计划的排程状态
+//                        /**
+//                         * 如果生产状态=待排程，则排程状态=待排程
+//                         * 如果生产状态=待发布，则排程状态=待发布
+//                         * 如果生产状态=待开工或加工中或已完工，则排程状态=已发布
+//                         */
+//                        if (two.getMinProductionStatus().equals(TO_BE_SCHEDULED)) {
+//                            blankOrderDo.setSchedulingstatus(SaveConstans.SchedulingStatus.TO_BE_SCHEDULED);
+//                            //存储日志
+//                            apsConflictLogService.recordLog("", "更新坯料计划状态为待排程，坯料计划ID为：" + blankOrderDo.getId(), "", 2, null);
+//                        } else if (two.getMinProductionStatus().equals(TO_BE_PUBLISHED)) {
+//                            blankOrderDo.setSchedulingstatus(SaveConstans.SchedulingStatus.TO_BE_PUBLISHED);
+//                        } else {
+//                            blankOrderDo.setSchedulingstatus(SaveConstans.SchedulingStatus.PUBLISHED);
+//                        }
                         needUpdateList.add(blankOrderDo);
                     }
                 }