aps-校验坯料计划

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

@@ -611,7 +611,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void apsAfter(ProductionScheduleRetVo productionScheduleRetVo, List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser) {
+    public void apsAfter(ProductionScheduleRetVo productionScheduleRetVo, List<ApsBlankOrderVo> apsBlankOrders, SysUserVo currentUser) {
         // 先删除所有作业的明细
         List<String> blankids = apsBlankOrders.stream().map(v -> v.getId()).collect(Collectors.toList());
 //        processOperationProcessEquService.remove(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
@@ -823,7 +823,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 //            apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>().in(ApsProcessOperationProcessEquDo::getBlankid, blankKeys).set(ApsProcessOperationProcessEquDo::getLockmark, "y"));
         }
         logger.info("作业加锁结束..: " + blankids);
-        backupProcessOperation(apsProcessOperationProcessEquDos, productionScheduleRetVo.getProcesses(),currentUser);
+        backupProcessOperation(apsProcessOperationProcessEquDos, productionScheduleRetVo.getProcesses(), currentUser);
     }
 
     /**
@@ -833,7 +833,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      * @param processes
      */
     private void backupProcessOperation(List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDos,
-                                        List<ProductionProcesses> processes,SysUserVo currentUser) {
+                                        List<ProductionProcesses> processes, SysUserVo currentUser) {
 
 
         // 工序作业明细ID
@@ -841,7 +841,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 .flatMap(List::stream)
                 .distinct()
                 .collect(Collectors.toList());
-        if(currentUser == null){
+        if (currentUser == null) {
             currentUser = CXCommonUtils.getCurrentUser();
         }
         //删除备份
@@ -2305,7 +2305,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         List<String> collect = endCheckOutputDesList.stream().distinct().collect(Collectors.toList());
         if (!collect.isEmpty()) {
             String join = String.join(",", collect);
-            return R.error("以下坯料输出成品重复：" + join);
+            return R.error("坯料计划" + apsBlankOrderDo.getBlanknumber() + " 以下坯料输出成品重复：" + join);
         }
 
         //如果坯料输出成品的计划输出订单重量合计>坯料的总重量，错误提示：坯料输出成品的计划输出订单重量合计不能大于坯料的总重量
@@ -3355,11 +3355,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         List<ApsProcessOperationProcessEquDo> needUpdateProcessEquList = new ArrayList<>();
         List<ApsProcessOperationProcessEquDo> clearBachMaterialProcessEquList = new ArrayList<>();
         //符合条件的需要先清除原待加工料卷批次号
-        updateOperationProcessEquList.forEach(equDo->{
+        updateOperationProcessEquList.forEach(equDo -> {
             //剩余待开工卷数 =计划加工卷数-已开工卷数-已取消卷数
             int leaveWaitWorkRoll = equDo.getPlanprocessrall() - equDo.getStartingroll() - equDo.getCancelroll();
-            if (leaveWaitWorkRoll>0){
-                if (StringUtils.isNotBlank(equDo.getBachmaterialprocess())){
+            if (leaveWaitWorkRoll > 0) {
+                if (StringUtils.isNotBlank(equDo.getBachmaterialprocess())) {
                     equDo.setBachmaterialprocess("");
                     clearBachMaterialProcessEquList.add(equDo);
                 }
@@ -3368,13 +3368,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         if (ObjectUtil.isNotEmpty(clearBachMaterialProcessEquList)) {
             apsProcessOperationProcessEquService.updateBatchById(clearBachMaterialProcessEquList);
         }
-        updateOperationProcessEquList.forEach(equDo->{
+        updateOperationProcessEquList.forEach(equDo -> {
             //剩余待开工卷数 =计划加工卷数-已开工卷数-已取消卷数
             int leaveWaitWorkRoll = equDo.getPlanprocessrall() - equDo.getStartingroll() - equDo.getCancelroll();
-            if (leaveWaitWorkRoll>0&& finalBatchNumberList.size()>0){
+            if (leaveWaitWorkRoll > 0 && finalBatchNumberList.size() > 0) {
                 //有几个剩余待开工卷数就要分配几个batchNumberList中批次号的个数
                 List<String> distributionNumbers = finalBatchNumberList.stream().limit(leaveWaitWorkRoll).collect(Collectors.toList());
-                equDo.setBachmaterialprocess(String.join(",",distributionNumbers));
+                equDo.setBachmaterialprocess(String.join(",", distributionNumbers));
                 finalBatchNumberList.removeAll(distributionNumbers);
                 needUpdateProcessEquList.add(equDo);
             }
@@ -3384,9 +3384,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
 
 
-
-
-
         //在制品的在制品状态=待加工
         //在制品的备料计划ID=该坯料计划ID
         if (ObjectUtil.isNotEmpty(addBatchNumberList)) {