aps-报工相关冗余字段

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

@@ -145,6 +145,18 @@ public class ReportCheckServiceImpl implements ReportCheckService {
             //如果是否坯料工序=是，坯料等级=检验等级
             if (reportRecordsDo.getReportifblankprocess().equals("是")) {
                 reportUpdateWrapper.set(ApsReportRecordsDo::getBlanklevel, checkLevel);
+            } else {
+                if (StringUtils.isNotBlank(reportRecordsDo.getBatchnumber())) {
+                    List<String> inputBatchNumber = Arrays.asList(reportRecordsDo.getBatchnumber().split(","));
+                    List<ApsWorkInProgressInventoryDo> inputList = apsWorkInProgressInventoryService.list(new LambdaQueryWrapper<ApsWorkInProgressInventoryDo>()
+                            .in(ApsWorkInProgressInventoryDo::getBatchnumber, inputBatchNumber)
+                            .isNotNull(ApsWorkInProgressInventoryDo::getInspectionlevel)
+                            .ne(ApsWorkInProgressInventoryDo::getInspectionlevel, ""));
+                    if (!inputList.isEmpty()) {
+                        ApsWorkInProgressInventoryDo minWorkInProgress = inputList.stream().min(Comparator.comparingInt(a -> checkLevelOrder.indexOf(a.getInspectionlevel()))).orElse(null);
+                        reportUpdateWrapper.set(ApsReportRecordsDo::getBlanklevel, minWorkInProgress.getInspectionlevel());
+                    }
+                }
             }
             //查询不合格的输出
             List<ApsReportOutputDo> unQualifiedList = reportOutputDos.stream().filter(item -> item.getQualified().equals("否")).collect(Collectors.toList());