aps-借调逻辑增加容错

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

@@ -508,7 +508,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             // 查询作业明细的所属作业ID
             List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDos = (List<ApsProcessOperationProcessEquDo>) apsProcessOperationProcessEquService.listByIds(orderLockVo.getId());
             //校验工序作业明细状态
-            if (!apsProcessOperationProcessEquDos.isEmpty()){
+            if (!apsProcessOperationProcessEquDos.isEmpty()) {
                 //解锁的情况下校验 工序作业对应的生产状态
                 boolean b = apsProcessOperationProcessEquDos.stream().allMatch(info -> JOBSTATUS_TO_BE_STARTING.equals(info.getWorkstatus()) ||
                         JOBSTATUS_TO_BE_END.equals(info.getWorkstatus()));
@@ -516,7 +516,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     return R.error("所选作业明细都已开工，不可以解锁，不能锁定");
                 }
             }
-            apsProcessOperationProcessEquDos = apsProcessOperationProcessEquDos.stream().filter(detail-> JOBSTATUS_TO_BE_START.equals(detail.getWorkstatus())).collect(Collectors.toList());
+            apsProcessOperationProcessEquDos = apsProcessOperationProcessEquDos.stream().filter(detail -> JOBSTATUS_TO_BE_START.equals(detail.getWorkstatus())).collect(Collectors.toList());
             List<String> updateEquIds = apsProcessOperationProcessEquDos.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
             //  所有作业ID
             List<String> proids = apsProcessOperationProcessEquDos.stream().map(ApsProcessOperationProcessEquDo::getProcessid).collect(Collectors.toList());
@@ -576,7 +576,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     List<String> lpeus = processDetailInfoByLockTime.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
                     List<ApsProcessOperationProcessEquDo> equDos = new ArrayList<>(apsProcessOperationProcessEquService.listByIds(lpeus));
                     //校验工序作业明细状态
-                    if (!equDos.isEmpty()){
+                    if (!equDos.isEmpty()) {
                         //解锁的情况下校验 工序作业对应的生产状态
                         boolean b = equDos.stream().allMatch(info -> JOBSTATUS_TO_BE_STARTING.equals(info.getWorkstatus()) ||
                                 JOBSTATUS_TO_BE_END.equals(info.getWorkstatus()));
@@ -584,7 +584,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                             return R.error("所选作业明细都已开工，不可以解锁，不能锁定");
                         }
                     }
-                    equDos = equDos.stream().filter(detail-> JOBSTATUS_TO_BE_START.equals(detail.getWorkstatus())).collect(Collectors.toList());
+                    equDos = equDos.stream().filter(detail -> JOBSTATUS_TO_BE_START.equals(detail.getWorkstatus())).collect(Collectors.toList());
                     List<String> updateEquIds = equDos.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
                     apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                             .in(ApsProcessOperationProcessEquDo::getId, updateEquIds)
@@ -953,7 +953,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
             //更新生产状态为“待发布”（20）
             List<ApsBlankOrderVo> toupstatus = apsBlankOrders.stream().filter(v ->
-                    blankids.contains(v.getId()) && (StringUtils.isBlank(v.getIfcp()) || "N".equals(v.getIfcp())))
+                            blankids.contains(v.getId()) && (StringUtils.isBlank(v.getIfcp()) || "N".equals(v.getIfcp())))
                     .collect(Collectors.toList());
             updateProductStatusByOrderIds(toupstatus);
             // 自动加锁坯料计划下的工序作业
@@ -3607,6 +3607,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             String batchnumber = progressWork.getBatchnumber();
             //查询被借调批次号的作业明细信息
             ApsProcessOperationProcessEquDo needBorrowOperationEqu = this.baseMapper.selectUseThisBatchNumberProcessEqu(batchnumber);
+            //没找到被借调的作业明细，则直接结束借调逻辑
+            if (ObjectUtil.isEmpty(needBorrowOperationEqu)) {
+                return;
+            }
             //查询被借调作业的信息
             ApsProcessOperationDo needBorrowOperation = apsProcessOperationService.getById(needBorrowOperationEqu.getProcessid());
 //            //获取该在制品作业明细的ID