feature 报工检验报错的问题

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

@@ -81,11 +81,11 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         ApsReportRecordsDo reportRecordsDo = apsReportRecordsService.getById(id);
         if (reportRecordsDo == null) {
             log.error("无法根据ID：{}获取到报工记录", id);
-            return R.error();
+            return R.error("无法获取到报工记录");
         }
         if (VERIFIED.equals(reportRecordsDo.getCheckstatus())) {
             log.error("当前报工记录已检验无法再次检验");
-            return R.error();
+            return R.error("当前报工记录已检验无法再次检验");
         }
         // 获取当前报工记录对应的工序作业记录
         ApsProcessOperationProcessEquDo currentProcessOperationEqu = apsProcessOperationProcessEquService.getById(reportRecordsDo.getProcessequid());
@@ -95,21 +95,21 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 .eq(ApsProcessOperationDo::getId, reportRecordsDo.getProcessoperationid()).eq(BaseDo::getDeleted, NO_DELETED));
         if (currentProcessOperationMainDo == null) {
             log.error("无法根据ID：{}获取到工序作业信息", id);
-            return R.error();
+            return R.error("无法获取到工序作业信息");
         }
         if (StringUtils.isBlank(currentProcessOperationMainDo.getBlankid())) {
             log.error("无法根据工序获取到生产订单信息");
-            return R.error();
+            return R.error("无法获取到生产订单信息");
         }
         // 前道工序作业ID
         String previousprocessid = currentProcessOperationMainDo.getPreviousprocessid();
         // 获取工序作业对应的输出物料信息
         ApsProcessOperationOutMaterDo operationOutMaterDoList = apsProcessOperationOutMaterService.getOne(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
-                .eq(ApsProcessOperationOutMaterDo::getMainid, processOperationEquId)
+                .eq(ApsProcessOperationOutMaterDo::getMainid, currentProcessOperationMainDo.getId())
                 .eq(BaseDo::getDeleted, NO_DELETED), false);
         if (operationOutMaterDoList == null) {
-            log.error("无法根据工序作业ID:{}获取对应的输出物料信息", processOperationEquId);
-            return R.error();
+            log.error("无法根据工序作业ID:{}获取对应的输出物料信息", currentProcessOperationMainDo.getId());
+            return R.error("无法获取到对应的输出物料信息");
         }
         // 获取该工序生成的物料输出信息
         List<ApsReportOutputDo> reportOutputDos = apsReportOutputService.list(new LambdaQueryWrapper<ApsReportOutputDo>()
@@ -118,17 +118,17 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 .eq(BaseDo::getDeleted, NO_DELETED));
         if (reportOutputDos.isEmpty()) {
             log.error("无法根据ID：{}获取到输出物料信息", id);
-            return R.error();
+            return R.error("无法获取到输出物料信息");
         }
         //获取批量计划
         ApsBlankOrderDo blankOrderDo = apsBlankOrderDao.selectById(currentProcessOperationMainDo.getBlankid());
         if (blankOrderDo == null) {
             log.error("无法根据ID：{}找到对应的订单信息", currentProcessOperationMainDo.getBlankid());
-            return R.error();
+            return R.error("无法获取订单信息");
         }
         if (StringUtils.isBlank(blankOrderDo.getProductionorderid())) {
             log.error("坯料计划对应的订单ID为空");
-            return R.error();
+            return R.error("无法通过坯料计划找到订单信息");
         }
         // 获取订单信息
         ApsProductionOrderDo productionOrderDo = apsProductionOrderService.getById(blankOrderDo.getProductionorderid());
@@ -147,7 +147,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 .collect(Collectors.toList());
         if (unqualificationOutPutList.isEmpty() && qualifiedOutPutList.isEmpty()) {
             log.debug("暂无检验的数据");
-            return R.ok();
+            return R.ok("暂无需要检验的数据");
         }
         String nextProcessId = currentProcessOperationMainDo.getNextprocessid();
         // 获取当前工序对应的后道工序信息
@@ -253,7 +253,8 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         apsProcessOperationProcessEquService.updateProductionStatus(req);
         apsReportOutputService.update(new LambdaUpdateWrapper<ApsReportOutputDo>()
                 .in(ApsReportOutputDo::getId,reportOutputDos.stream().map(ApsReportOutputDo::getId).collect(Collectors.toList()))
-                .set(ApsReportOutputDo::getCheckstatus,"已检验"));
+                .set(ApsReportOutputDo::getCheckstatus,VERIFIED));
+        reportRecordsDo.setCheckstatus(VERIFIED);
         return R.ok();
     }