feature 报工校验更新检验状态

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

@@ -95,7 +95,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
      */
     public void updateAboutStateByProcessId(List<ProcessIdRelationVo> updateIds) {
         // 防止sql 过长拆分
-        List<List<ProcessIdRelationVo>> partition = Lists.partition(updateIds, 8);
+        List<List<ProcessIdRelationVo>> partition = Lists.partition(updateIds, 20);
         partition.forEach(data -> {
             apsProcessOperationProcessEquDao.updateAboutStateByProcessId(data);
         });

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

@@ -113,7 +113,9 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         }
         // 获取该工序生成的物料输出信息
         List<ApsReportOutputDo> reportOutputDos = apsReportOutputService.list(new LambdaQueryWrapper<ApsReportOutputDo>()
-                .eq(ApsReportOutputDo::getMainid, id).eq(BaseDo::getDeleted, NO_DELETED));
+                 .eq(ApsReportOutputDo::getCheckstatus,"待检验")
+                .eq(ApsReportOutputDo::getMainid, id)
+                .eq(BaseDo::getDeleted, NO_DELETED));
         if (reportOutputDos.isEmpty()) {
             log.error("无法根据ID：{}获取到输出物料信息", id);
             return R.error();
@@ -136,9 +138,13 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         }
 
         // 获取检验不合格批次的数量
-        List<ApsReportOutputDo> unqualificationOutPutList = reportOutputDos.stream().filter(info -> NO.equals(info.getQualified())).collect(Collectors.toList());
+        List<ApsReportOutputDo> unqualificationOutPutList = reportOutputDos.stream()
+                .filter(info -> NO.equals(info.getQualified()))
+                .collect(Collectors.toList());
         // 检验合格的数量信息
-        List<ApsReportOutputDo> qualifiedOutPutList = reportOutputDos.stream().filter(info -> YES.equals(info.getQualified())).collect(Collectors.toList());
+        List<ApsReportOutputDo> qualifiedOutPutList = reportOutputDos.stream()
+                .filter(info -> YES.equals(info.getQualified()))
+                .collect(Collectors.toList());
         if (unqualificationOutPutList.isEmpty() && qualifiedOutPutList.isEmpty()) {
             log.debug("暂无检验的数据");
             return R.ok();
@@ -167,7 +173,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         // 更新已检验卷数
         int inspectQuantity = reportOutputDos.size();
         // 订单信息
-        currentProductionOrderDoDispose(productionOrderDo, unqualificationOutPutList);
+        //currentProductionOrderDoDispose(productionOrderDo, unqualificationOutPutList);
         // 在制品
         updateArticlesProcessData(unqualificationOutPutList, qualifiedOutPutList, reportRecordsDo,
                 apsWorkInProgressInventoryDos, nextProcessOperationDos, currentProcessOperationMainDo,
@@ -245,6 +251,9 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         req.setBlankId(blankOrderDo.getId());
         // 更新
         apsProcessOperationProcessEquService.updateProductionStatus(req);
+        apsReportOutputService.update(new LambdaUpdateWrapper<ApsReportOutputDo>()
+                .in(ApsReportOutputDo::getId,reportOutputDos.stream().map(ApsReportOutputDo::getId).collect(Collectors.toList()))
+                .set(ApsReportOutputDo::getCheckstatus,"已检验"));
         return R.ok();
     }