aps-检验如果明细或者作业没有下一道工序，直接跳过

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

@@ -342,11 +342,15 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         // 获取当前工序作业明细对应的下一个工序作也明细ID
         String nextProcessesIds = currentProcessOperationEqu.getNextprocessesids();
         log.debug("当前作业对应的下一个工序作业：{}以及下一个工序作业明细：{}", nextProcessId, nextProcessesIds);
-        if ((StringUtils.isNotBlank(nextProcessId) && StringUtils.isBlank(nextProcessesIds)) ||
-                StringUtils.isBlank(nextProcessId) && StringUtils.isNotBlank(nextProcessesIds)) {
-            log.error("当前作业的下一个 工序作业id或者工序作业明细id 为空");
-            throw new CustomException("工序作业数据异常");
+        //如果找不到下一道，直接结束，不流转
+        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 为空");
+//            throw new CustomException("工序作业数据异常");
+//        }
         List<ApsProcessOperationProcessEquDo> nextProcessOperationProcessEquDos = new ArrayList<>();
         List<ApsProcessOperationDo> nextProcessList = new ArrayList<>();
         List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList = apsProductionMergeOrderService.list(new LambdaQueryWrapper<ApsProductionMergeOrderDo>().eq(BaseDo::getDeleted, NO_DELETED));
@@ -801,14 +805,14 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         workInProgressInventoryDos.stream()
                 .filter(inventory -> outputNumberList.contains(inventory.getBatchnumber()))
                 .collect(Collectors.toList()).forEach(data -> {
-            if (StringUtils.isNotBlank(workingProcessStatus)) {
-                data.setWorkinprocessstatus(workingProcessStatus);
-            }
-            if (StringUtils.isNotBlank(workingProcessType)) {
-                data.setWorkinprocesstype(workingProcessType);
-            }
+                    if (StringUtils.isNotBlank(workingProcessStatus)) {
+                        data.setWorkinprocessstatus(workingProcessStatus);
+                    }
+                    if (StringUtils.isNotBlank(workingProcessType)) {
+                        data.setWorkinprocesstype(workingProcessType);
+                    }
 
-        });
+                });
         return outputNumberList;
     }
 
@@ -1250,42 +1254,42 @@ public class ReportCheckServiceImpl implements ReportCheckService {
             workInProgressInventoryDos.stream()
                     .filter(inventory -> apsReportOutputDo.getOutputnumber().equals(inventory.getBatchnumber()))
                     .collect(Collectors.toList()).forEach(data -> {
-                if ("是".equals(ifblankprocess)) {
-                    data.setBlankname(apsReportOutputDo.getOutputdesc());
-                }
-                data.setWorkinprocess(apsReportOutputDo.getOutputdesc());
-                data.setInspectionlevel(apsReportOutputDo.getInsepctionlevel());
-                data.setIsqualified(apsReportOutputDo.getQualified());
-                String formatMajor = handleDefect(apsReportOutputDo.getMajor(), defectTypes);
-                String formatMinor = handleDefect(apsReportOutputDo.getMinor(), defectTypes);
-                if (StringUtils.isNotBlank(formatMajor) && StringUtils.isNotBlank(formatMinor)) {
-                    if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())) {
-                        data.setRemark("主要缺陷：" + formatMajor + "；次要缺陷：" + formatMinor + "；检验备注：" + apsReportOutputDo.getCheckremark() + "；");
-                    } else {
-                        data.setRemark("主要缺陷：" + formatMajor + "；次要缺陷：" + formatMinor + "；");
-                    }
-                } else {
-                    if (StringUtils.isNotBlank(formatMajor)) {
-                        if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())) {
-                            data.setRemark("主要缺陷：" + formatMajor + "；检验备注：" + apsReportOutputDo.getCheckremark() + "；");
-                        } else {
-                            data.setRemark("主要缺陷：" + formatMajor + "；");
+                        if ("是".equals(ifblankprocess)) {
+                            data.setBlankname(apsReportOutputDo.getOutputdesc());
                         }
-                    } else {
-                        if (StringUtils.isNotBlank(formatMinor)) {
+                        data.setWorkinprocess(apsReportOutputDo.getOutputdesc());
+                        data.setInspectionlevel(apsReportOutputDo.getInsepctionlevel());
+                        data.setIsqualified(apsReportOutputDo.getQualified());
+                        String formatMajor = handleDefect(apsReportOutputDo.getMajor(), defectTypes);
+                        String formatMinor = handleDefect(apsReportOutputDo.getMinor(), defectTypes);
+                        if (StringUtils.isNotBlank(formatMajor) && StringUtils.isNotBlank(formatMinor)) {
                             if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())) {
-                                data.setRemark("次要缺陷：" + formatMinor + "；检验备注：" + apsReportOutputDo.getCheckremark() + "；");
+                                data.setRemark("主要缺陷：" + formatMajor + "；次要缺陷：" + formatMinor + "；检验备注：" + apsReportOutputDo.getCheckremark() + "；");
                             } else {
-                                data.setRemark("次要缺陷：" + formatMinor + "；");
+                                data.setRemark("主要缺陷：" + formatMajor + "；次要缺陷：" + formatMinor + "；");
                             }
                         } else {
-                            if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())) {
-                                data.setRemark("检验备注：" + apsReportOutputDo.getCheckremark() + "；");
+                            if (StringUtils.isNotBlank(formatMajor)) {
+                                if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())) {
+                                    data.setRemark("主要缺陷：" + formatMajor + "；检验备注：" + apsReportOutputDo.getCheckremark() + "；");
+                                } else {
+                                    data.setRemark("主要缺陷：" + formatMajor + "；");
+                                }
+                            } else {
+                                if (StringUtils.isNotBlank(formatMinor)) {
+                                    if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())) {
+                                        data.setRemark("次要缺陷：" + formatMinor + "；检验备注：" + apsReportOutputDo.getCheckremark() + "；");
+                                    } else {
+                                        data.setRemark("次要缺陷：" + formatMinor + "；");
+                                    }
+                                } else {
+                                    if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())) {
+                                        data.setRemark("检验备注：" + apsReportOutputDo.getCheckremark() + "；");
+                                    }
+                                }
                             }
                         }
-                    }
-                }
-            });
+                    });
         });
     }