工序检验逻辑修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -1456,7 +1456,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
 
         // 检验记录
-        InspectionTask prWorkCheckByWpId = inspectionTaskMapper.selectOne(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, wpId));
+        InspectionTask prWorkCheckByWpId = inspectionTaskMapper.selectOne(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, wpId), false);
         if (prWorkCheckByWpId != null) {
             ProduceMonitorWorkCheckVO workCheckVO = new ProduceMonitorWorkCheckVO();
             BeanUtils.copyProperties(prWorkCheckByWpId, workCheckVO);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -2291,7 +2291,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         if (null == task) {
             throw new IllegalArgumentException("error id!");
         }
+        int checkResult = task.getCheckResult();
         List<WorkPlanItem> itemList = wpItemService.listByTaskId(id);
+        if (CollectionUtils.isNotEmpty(itemList)) {
             StatusCountMap map = new StatusCountMap();
             int sumCheckQ = 0, sumTestQty = 0, sumLossQty = 0;
             for (WorkPlanItem item : itemList) {
@@ -2313,7 +2315,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                 task.setReceiveDate(LocalDateTime.now());
             }
             // checkResult 处理
-        int checkResult = InspectionTaskConst.CHECK_RESULT_TODO; // 默认 数据库
+            checkResult = InspectionTaskConst.CHECK_RESULT_TODO; // 默认 数据库
             if (countToDo == 0) { // 未检验为0
                 if (countOK == itemList.size()) { // 全部item 合格
                     checkResult = InspectionTaskConst.CHECK_RESULT_OK;
@@ -2342,6 +2344,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             task.setStatus(checkResult);
             // 更新
             updateById(task);
+        }
         // 如果检验任务结果不合格，创建 生产处置单
         if (checkResult == InspectionTaskConst.CHECK_RESULT_NG) {
             addRsSheet(id);
@@ -2510,7 +2513,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                 sub.put("partCode", sjCompleteVO.getPartCode());//零件号
                 sub.put("material", sjCompleteVO.getMaterial());//材料
                 sub.put("plate", sjCompleteVO.getPlate());//镀种
-                sub.put("poArea",sjCompleteVO.getYpArea());//面积
+                sub.put("poArea", sjCompleteVO.getYpArea());//面积
                 sunPrWorkOrderList.add(sub);
             }
         }