aps-报工检验后续作业判断

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

@@ -342,10 +342,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         // 获取当前工序作业明细对应的下一个工序作也明细ID
         String nextProcessesIds = currentProcessOperationEqu.getNextprocessesids();
         log.debug("当前作业对应的下一个工序作业：{}以及下一个工序作业明细：{}", nextProcessId, nextProcessesIds);
-        //如果找不到下一道，直接结束，不流转
-        if (StringUtils.isBlank(nextProcessesIds) || StringUtils.isBlank(nextProcessId)) {
-            return;
-        }
 //        if ((StringUtils.isNotBlank(nextProcessId) && StringUtils.isBlank(nextProcessesIds)) ||
 //                StringUtils.isBlank(nextProcessId) && StringUtils.isNotBlank(nextProcessesIds)) {
 //            log.error("当前作业的下一个 工序作业id或者工序作业明细id 为空");
@@ -355,7 +351,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         List<ApsProcessOperationDo> nextProcessList = new ArrayList<>();
         List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList = apsProductionMergeOrderService.list(new LambdaQueryWrapper<ApsProductionMergeOrderDo>().eq(BaseDo::getDeleted, NO_DELETED));
         List<ApsProductDetailDo> apsProductDetailDoList = apsProductDetailService.list(new LambdaQueryWrapper<ApsProductDetailDo>().eq(BaseDo::getDeleted, NO_DELETED));
-        if (StringUtils.isNotBlank(nextProcessesIds)) {
+        if (StringUtils.isNotBlank(nextProcessesIds) && StringUtils.isNotBlank(nextProcessId)) {
             // 被流转的工序作业明细
             nextProcessOperationProcessEquDos = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
                     .in(ApsProcessOperationProcessEquDo::getId, Arrays.asList(nextProcessesIds.split(",")))