aps-坯料计划发布和撤回发布，变更状态，走统一方法

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

@@ -248,46 +248,51 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             // 工序作业信息
             List<ApsProcessOperationDo> processOperationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
                     .eq(ApsProcessOperationDo::getBlankid, blankId).orderByDesc(ApsProcessOperationDo::getProcessstatus));
-            // 坯料计划排程状态
-            String schedulingstatus;
-            // 坯料计划生产状态
-            String producttStatus;
-            if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_PUBLISHED)) {
-                schedulingstatus = SCHEDULSTATUS_TORELEASE;
-                producttStatus = TO_BE_PUBLISHED;
-            } else if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_SCHEDULED)) {
-                schedulingstatus = SCHEDULSTATUS_TOSCHEDULE;
-                producttStatus = TO_BE_SCHEDULED;
-            } else {
-                schedulingstatus = SCHEDULSTATUS_HASRELEASE;
-                List<String> processStatusList = processOperationDos.stream()
-                        .map(ApsProcessOperationDo::getProcessstatus)
-                        .distinct()
-                        .collect(Collectors.toList());
-                if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_STARTED)) {
-                    producttStatus = TO_BE_STARTED;
-                } else if (processStatusList.size() == 1 && processStatusList.get(0).equals(COMPLETED)) {
-                    producttStatus = COMPLETED;
-                } else {
-                    producttStatus = PROCESSING;
-                }
-            }
-            ApsBlankOrderDo blankOrderDo = this.getById(blankId);
-            productionOrderIds.add(blankOrderDo.getProductionorderid());
-            this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().eq(ApsBlankOrderDo::getId, blankId)
-                    .set(ApsBlankOrderDo::getProductstatus, producttStatus)
-                    .set(ApsBlankOrderDo::getSchedulingstatus, schedulingstatus));
-            //存储日志
-            apsConflictLogService.recordLog("", "更新坯料计划状态为待排程，坯料计划ID为：" + blankId, "", 1, null);
+            //公共方法更新生产状态等
+            CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();
+            req.setProcessOperationId(processOperationDos.get(0).getId());
+            apsProcessOperationProcessEquService.updateProductionStatus(req);
+
+//            // 坯料计划排程状态
+//            String schedulingstatus;
+//            // 坯料计划生产状态
+//            String producttStatus;
+//            if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_PUBLISHED)) {
+//                schedulingstatus = SCHEDULSTATUS_TORELEASE;
+//                producttStatus = TO_BE_PUBLISHED;
+//            } else if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_SCHEDULED)) {
+//                schedulingstatus = SCHEDULSTATUS_TOSCHEDULE;
+//                producttStatus = TO_BE_SCHEDULED;
+//            } else {
+//                schedulingstatus = SCHEDULSTATUS_HASRELEASE;
+//                List<String> processStatusList = processOperationDos.stream()
+//                        .map(ApsProcessOperationDo::getProcessstatus)
+//                        .distinct()
+//                        .collect(Collectors.toList());
+//                if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_STARTED)) {
+//                    producttStatus = TO_BE_STARTED;
+//                } else if (processStatusList.size() == 1 && processStatusList.get(0).equals(COMPLETED)) {
+//                    producttStatus = COMPLETED;
+//                } else {
+//                    producttStatus = PROCESSING;
+//                }
+//            }
+//            ApsBlankOrderDo blankOrderDo = this.getById(blankId);
+//            productionOrderIds.add(blankOrderDo.getProductionorderid());
+//            this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().eq(ApsBlankOrderDo::getId, blankId)
+//                    .set(ApsBlankOrderDo::getProductstatus, producttStatus)
+//                    .set(ApsBlankOrderDo::getSchedulingstatus, schedulingstatus));
+//            //存储日志
+//            apsConflictLogService.recordLog("", "更新坯料计划状态为待排程，坯料计划ID为：" + blankId, "", 1, null);
         });
 //        // 更新产品明细的生产状态
 //        apsProductDetailDao.publishCancel(blankIds);
-        // 更新订单的生产状态
-        apsProcessOperationDao.publishCancel(productionOrderIds);
-        //更新产品明细的生产状态
-        for (String productionOrderId : productionOrderIds) {
-            apsProcessOperationProcessEquServiceImpl.updateProductDetail(productionOrderId);
-        }
+//        // 更新订单的生产状态
+//        apsProcessOperationDao.publishCancel(productionOrderIds);
+//        //更新产品明细的生产状态
+//        for (String productionOrderId : productionOrderIds) {
+//            apsProcessOperationProcessEquServiceImpl.updateProductDetail(productionOrderId);
+//        }
         // 根据坯料ID 删除 备份数据
         ApsUtils.clearBackup(null);
         return R.ok();
@@ -321,43 +326,47 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             // 工序作业信息
             List<ApsProcessOperationDo> processOperationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
                     .eq(ApsProcessOperationDo::getBlankid, blankId).orderByDesc(ApsProcessOperationDo::getProcessstatus));
-            // 坯料计划排程状态
-            String schedulingstatus;
-            // 坯料计划生产状态
-            String producttStatus;
-            if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_PUBLISHED)) {
-                schedulingstatus = SCHEDULSTATUS_TORELEASE;
-                producttStatus = TO_BE_PUBLISHED;
-            } else if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_SCHEDULED)) {
-                schedulingstatus = SCHEDULSTATUS_TOSCHEDULE;
-                producttStatus = TO_BE_SCHEDULED;
-            } else {
-                schedulingstatus = SCHEDULSTATUS_HASRELEASE;
-                List<String> processStatusList = processOperationDos.stream()
-                        .map(ApsProcessOperationDo::getProcessstatus)
-                        .distinct()
-                        .collect(Collectors.toList());
-                if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_STARTED)) {
-                    producttStatus = TO_BE_STARTED;
-                } else if (processStatusList.size() == 1 && processStatusList.get(0).equals(COMPLETED)) {
-                    producttStatus = COMPLETED;
-                } else {
-                    producttStatus = PROCESSING;
-                }
-            }
-            ApsBlankOrderDo blankOrderDo = this.getById(blankId);
-            productionOrderIds.add(blankOrderDo.getProductionorderid());
-            this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().eq(ApsBlankOrderDo::getId, blankId)
-                    .set(ApsBlankOrderDo::getProductstatus, producttStatus)
-                    .set(ApsBlankOrderDo::getSchedulingstatus, schedulingstatus));
+            //公共方法更新生产状态等
+            CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();
+            req.setProcessOperationId(processOperationDos.get(0).getId());
+            apsProcessOperationProcessEquService.updateProductionStatus(req);
+//            // 坯料计划排程状态
+//            String schedulingstatus;
+//            // 坯料计划生产状态
+//            String producttStatus;
+//            if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_PUBLISHED)) {
+//                schedulingstatus = SCHEDULSTATUS_TORELEASE;
+//                producttStatus = TO_BE_PUBLISHED;
+//            } else if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_SCHEDULED)) {
+//                schedulingstatus = SCHEDULSTATUS_TOSCHEDULE;
+//                producttStatus = TO_BE_SCHEDULED;
+//            } else {
+//                schedulingstatus = SCHEDULSTATUS_HASRELEASE;
+//                List<String> processStatusList = processOperationDos.stream()
+//                        .map(ApsProcessOperationDo::getProcessstatus)
+//                        .distinct()
+//                        .collect(Collectors.toList());
+//                if (processOperationDos.get(0).getProcessstatus().equals(TO_BE_STARTED)) {
+//                    producttStatus = TO_BE_STARTED;
+//                } else if (processStatusList.size() == 1 && processStatusList.get(0).equals(COMPLETED)) {
+//                    producttStatus = COMPLETED;
+//                } else {
+//                    producttStatus = PROCESSING;
+//                }
+//            }
+//            ApsBlankOrderDo blankOrderDo = this.getById(blankId);
+//            productionOrderIds.add(blankOrderDo.getProductionorderid());
+//            this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().eq(ApsBlankOrderDo::getId, blankId)
+//                    .set(ApsBlankOrderDo::getProductstatus, producttStatus)
+//                    .set(ApsBlankOrderDo::getSchedulingstatus, schedulingstatus));
         });
 //        // 更新产品明细的生产状态
 //        apsProductDetailDao.publishCancel(blankIds);
-        // 更新订单的生产状态
-        apsProcessOperationDao.publishCancel(productionOrderIds);
-        for (String productionOrderId : productionOrderIds) {
-            apsProcessOperationProcessEquServiceImpl.updateProductDetail(productionOrderId);
-        }
+//        // 更新订单的生产状态
+//        apsProcessOperationDao.publishCancel(productionOrderIds);
+//        for (String productionOrderId : productionOrderIds) {
+//            apsProcessOperationProcessEquServiceImpl.updateProductDetail(productionOrderId);
+//        }
 //        //退料
 //        for (String blankId : blankIds) {
 //            removeBatchNumberByBlankId(blankId);

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

@@ -174,7 +174,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     private AspCheckItemsServiceImpl aspCheckItemsServiceImpl;
 
     /**
-     * 发布订单排程
+     * 发布订单排程(废弃)
      *
      * @param productionOrderIds
      * @return
@@ -217,7 +217,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     }
 
     /**
-     * 取消发布订单排程
+     * 取消发布订单排程（废弃）
      *
      * @param productionOrderIds
      * @return

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProductionOrderController.java

@@ -33,7 +33,7 @@ public class ApsProductionOrderController {
     private ApsProductionOrderService apsProductionOrderService;
 
     /**
-     * 发布
+     * 发布(废弃)
      *
      * @param productionOrderIds
      * @return
@@ -44,7 +44,7 @@ public class ApsProductionOrderController {
     }
 
     /**
-     * 取消发布
+     * 取消发布(废弃)
      *
      * @param productionOrderIds
      * @return