检验任务临时保存

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java

@@ -704,6 +704,14 @@ public class InspectionTaskController extends BladeController {
         return service.fill(taskDetailVO);
     }
 
+
+    @PostMapping("/interimSave")
+    @ApiOperationSupport(order = 9)
+    @Operation(summary = "", description = "传入taskDetailVO")
+    public R interimSave(@Valid @RequestBody InspectionTaskDetailVO taskDetailVO) {
+        return service.interimSave(taskDetailVO);
+    }
+
     /**
      * [检验任务] 查询同槽/同炉
      */

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

@@ -117,6 +117,8 @@ public interface IInspectionTaskService extends BaseService<InspectionTask> {
 
     public R fill(InspectionTaskDetailVO detailVO);
 
+    public R interimSave(InspectionTaskDetailVO detailVO);
+
     IPage<InspectionTaskListVO> listSearch(IPage<InspectionTaskListVO> page, InspectionTaskSearch search);
     IPage<InspectionTaskListVO> queryWorkOrder(IPage<InspectionTaskListVO> page, InspectionTaskSearch search);
     List<InspectionTaskListVO> correspondingProcess(Long woId);

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

@@ -547,7 +547,6 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                     }
                 }
             }
-
             if (InspectionTaskConst.CHECK_RESULT_TODO.equals(wpItemDB.getCheckResult()) &&
                     !InspectionTaskConst.CHECK_RESULT_TODO.equals(wpItemVO.getCheckResult())) { // 数据库中是待检测的，新传入数据不是待检测的。
                 // copy from VO
@@ -559,6 +558,10 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                 }
                 // 赋值 质检时间
                 wpItemDB.setCheckDate(LocalDateTime.now());
+            } else if (AuthUtil.getUser() != null && wpItemDB.getCheckUserId() != null && wpItemDB.getCheckUserId().equals(AuthUtil.getUser().getUserId())) {
+                // 同检测人可以修改
+                BeanUtil.copyProperties(wpItemVO, wpItemDB);
+                wpItemDB.setCheckDate(LocalDateTime.now());
             }
             // 更新 WorkPlanItem
             wpItemService.updateById(wpItemDB);
@@ -610,6 +613,52 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
     }
 
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R interimSave(InspectionTaskDetailVO detailVO) {
+        for (WorkPlanItemVO wpItemVO : detailVO.getWpItemList()) {
+            WorkPlanItem wpItemDB = wpItemService.getById(wpItemVO.getId());
+            WorkPlan wpi = workPlanMapper.selectById(wpItemDB.getWpId());
+            if (null != wpi) {
+                WorkOrder order = workOrderMapper.selectById(wpi.getWoId());
+                if (null != order) {
+                    YieldOrder yieldOrder = yieldOrderMapper.selectById(order.getYoId());
+                    String[] arr = new String[]{"YH", "CASTH", "YB", "YC", "SAST", "CISS", "EK"};
+                    String[] chrr = new String[]{"董以青", "王跃伟", "刘旭", "张琼琼", "张楠", "朱辉", "高博", "宁亚美", "党哲", "左帅通", "赵亚丽"};
+                    for (String s : arr) {
+                        if (s == yieldOrder.getProductIdent()) {
+                            for (String s1 : chrr) {
+                                if (s1 == AuthUtil.getNickName()) {
+                                    return R.fail("当前用户无当前等级检验资质！");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            wpItemDB.setCoatingType(wpItemVO.getCoatingType());
+            wpItemDB.setSourceType(wpItemVO.getSourceType());
+            wpItemDB.setSourceWoCode(wpItemVO.getSourceWoCode());
+            wpItemDB.setSourceOrders(wpItemVO.getSourceOrders());
+            wpItemDB.setSourceId(wpItemVO.getSourceId());
+            wpItemDB.setSourceProcess(wpItemVO.getSourceProcess());
+            wpItemService.updateById(wpItemDB);
+            QueryWrapper<WorkPlanItemDetail> qw = new QueryWrapper<>();
+            qw.eq("WORK_PLAN_ITEM_ID", wpItemDB.getId());
+            wpItemDetailService.remove(qw);
+            if (null != wpItemVO.getWpItemDetailList() && wpItemVO.getWpItemDetailList().size() > 0) {
+                for (WorkPlanItemDetailVO wpItemDetailVO : wpItemVO.getWpItemDetailList()) {
+                    WorkPlanItemDetail wpItemDetail = new WorkPlanItemDetail();
+                    BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail);
+                    wpItemDetail.setWorkPlanItemId(wpItemDB.getId());
+                    wpItemDetail.setId(null);
+                    wpItemDetailService.save(wpItemDetail);
+                }
+            }
+        }
+        return R.success("保存成功");
+    }
+
     @Override
     public IPage<InspectionTaskListVO> listSearch(IPage<InspectionTaskListVO> page, InspectionTaskSearch search) {
         List<InspectionTaskListVO> listVO = baseMapper.listSearch(page, search);