生产质量检验

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java

@@ -131,4 +131,7 @@ public class WorkPlanItem extends BaseEntity {
 
 	@Schema(description = "来源工序号")
 	private String sourceOrders;
+
+	@Schema(description = "来源ID")
+	private Long sourceId;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java

@@ -25,11 +25,11 @@ public class WorkPlanItemVO extends WorkPlanItem {
     /**
      * 表层
      */
-    private static Integer SURFACE_COAT = 1;
+    public static Integer SURFACE_COAT = 1;
     /**
      * 底镀层
      */
-    private static Integer UNDER_COAT = 2;
+    public static Integer UNDER_COAT = 2;
 
 
     private static Map<Integer, String> coatTypeMap = new HashMap<>(3);
@@ -42,12 +42,12 @@ public class WorkPlanItemVO extends WorkPlanItem {
     /**
      * 实测值
      */
-    private static Integer ACTUAL_SOURCE = 1;
+    public static Integer ACTUAL_SOURCE = 1;
 
     /**
      * 共享值
      */
-    private  static Integer SHARE_SOURCE = 2;
+    public  static Integer SHARE_SOURCE = 2;
 
     private static Map<Integer, String> sourceTypeMap = new HashMap<>(3);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessProjectController.java

@@ -50,8 +50,10 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
+
 import java.util.Map;
 import java.util.List;
+
 import jakarta.servlet.http.HttpServletResponse;
 
 /**
@@ -66,96 +68,97 @@ import jakarta.servlet.http.HttpServletResponse;
 @Tag(name = "工序项目信息表", description = "工序项目信息表接口")
 public class DsProcessProjectController extends BladeController {
 
-	private final IDsProcessProjectService dsProcessProjectService;
+    private final IDsProcessProjectService dsProcessProjectService;
-
+
-	/**
+    /**
-	 * 工序项目信息表 详情
+     * 工序项目信息表 详情
-	 */
+     */
-	@GetMapping("/detail")
+    @GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
+    @ApiOperationSupport(order = 1)
-	@Operation(summary = "详情", description  = "传入dsProcessProject")
+    @Operation(summary = "详情", description = "传入dsProcessProject")
-	public R<DsProcessProjectVO> detail(DsProcessProjectEntity dsProcessProject) {
+    public R<DsProcessProjectVO> detail(DsProcessProjectEntity dsProcessProject) {
-		DsProcessProjectEntity detail = dsProcessProjectService.getOne(Condition.getQueryWrapper(dsProcessProject));
+        DsProcessProjectEntity detail = dsProcessProjectService.getOne(Condition.getQueryWrapper(dsProcessProject));
-		return R.data(DsProcessProjectWrapper.build().entityVO(detail));
+        return R.data(DsProcessProjectWrapper.build().entityVO(detail));
-	}
+    }
-	/**
+
-	 * 工序项目信息表 分页
+    /**
-	 */
+     * 工序项目信息表 分页
-	@GetMapping("/list")
+     */
-	@ApiOperationSupport(order = 2)
+    @GetMapping("/list")
-	@Operation(summary = "分页", description  = "传入dsProcessProject")
+    @ApiOperationSupport(order = 2)
-	public R<IPage<DsProcessProjectVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> dsProcessProject, Query query) {
+    @Operation(summary = "分页", description = "传入dsProcessProject")
-		IPage<DsProcessProjectEntity> pages = dsProcessProjectService.page(Condition.getPage(query), Condition.getQueryWrapper(dsProcessProject, DsProcessProjectEntity.class));
+    public R<IPage<DsProcessProjectVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> dsProcessProject, Query query) {
-		return R.data(DsProcessProjectWrapper.build().pageVO(pages));
+        IPage<DsProcessProjectEntity> pages = dsProcessProjectService.page(Condition.getPage(query), Condition.getQueryWrapper(dsProcessProject, DsProcessProjectEntity.class));
-	}
+        return R.data(DsProcessProjectWrapper.build().pageVO(pages));
-
+    }
-	/**
+
-	 * 工序项目信息表 自定义分页
+    /**
-	 */
+     * 工序项目信息表 自定义分页
-	@GetMapping("/page")
+     */
-	@ApiOperationSupport(order = 3)
+    @GetMapping("/page")
-	@Operation(summary = "分页", description  = "传入dsProcessProject")
+    @ApiOperationSupport(order = 3)
-	public R<IPage<DsProcessProjectVO>> page(DsProcessProjectVO dsProcessProject, Query query) {
+    @Operation(summary = "分页", description = "传入dsProcessProject")
-		IPage<DsProcessProjectVO> pages = dsProcessProjectService.selectDsProcessProjectPage(Condition.getPage(query), dsProcessProject);
+    public R<IPage<DsProcessProjectVO>> page(DsProcessProjectVO dsProcessProject, Query query) {
-		return R.data(pages);
+        IPage<DsProcessProjectVO> pages = dsProcessProjectService.selectDsProcessProjectPage(Condition.getPage(query), dsProcessProject);
-	}
+        return R.data(pages);
-
+    }
-	/**
+
-	 * 工序项目信息表 新增
+    /**
-	 */
+     * 工序项目信息表 新增
-	@PostMapping("/save")
+     */
-	@ApiOperationSupport(order = 4)
+    @PostMapping("/save")
-	@Operation(summary = "新增", description  = "传入dsProcessProject")
+    @ApiOperationSupport(order = 4)
-	public R save(@Valid @RequestBody DsProcessProjectEntity dsProcessProject) {
+    @Operation(summary = "新增", description = "传入dsProcessProject")
-		return R.status(dsProcessProjectService.save(dsProcessProject));
+    public R save(@Valid @RequestBody DsProcessProjectEntity dsProcessProject) {
-	}
+        return R.status(dsProcessProjectService.save(dsProcessProject));
-
+    }
-	/**
+
-	 * 工序项目信息表 修改
+    /**
-	 */
+     * 工序项目信息表 修改
-	@PostMapping("/update")
+     */
-	@ApiOperationSupport(order = 5)
+    @PostMapping("/update")
-	@Operation(summary = "修改", description  = "传入dsProcessProject")
+    @ApiOperationSupport(order = 5)
-	public R update(@Valid @RequestBody DsProcessProjectEntity dsProcessProject) {
+    @Operation(summary = "修改", description = "传入dsProcessProject")
-		return R.status(dsProcessProjectService.updateById(dsProcessProject));
+    public R update(@Valid @RequestBody DsProcessProjectEntity dsProcessProject) {
-	}
+        return R.status(dsProcessProjectService.updateById(dsProcessProject));
-
+    }
-	/**
+
-	 * 工序项目信息表 新增或修改
+    /**
-	 */
+     * 工序项目信息表 新增或修改
-	@PostMapping("/submit")
+     */
-	@ApiOperationSupport(order = 6)
+    @PostMapping("/submit")
-	@Operation(summary = "新增或修改", description  = "传入dsProcessProject")
+    @ApiOperationSupport(order = 6)
-	public R submit(@Valid @RequestBody DsProcessProjectEntity dsProcessProject) {
+    @Operation(summary = "新增或修改", description = "传入dsProcessProject")
-		return R.status(dsProcessProjectService.saveOrUpdate(dsProcessProject));
+    public R submit(@Valid @RequestBody DsProcessProjectEntity dsProcessProject) {
-	}
+        return R.status(dsProcessProjectService.saveOrUpdate(dsProcessProject));
-
+    }
-	/**
+
-	 * 工序项目信息表 删除
+    /**
-	 */
+     * 工序项目信息表 删除
-	@PostMapping("/remove")
+     */
-	@ApiOperationSupport(order = 7)
+    @PostMapping("/remove")
-	@Operation(summary = "逻辑删除", description  = "传入ids")
+    @ApiOperationSupport(order = 7)
-	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+    @Operation(summary = "逻辑删除", description = "传入ids")
-		return R.status(dsProcessProjectService.deleteLogic(Func.toLongList(ids)));
+    public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-	}
+        return R.status(dsProcessProjectService.deleteLogic(Func.toLongList(ids)));
-
+    }
-
+
-	/**
+
-	 * 导出数据
+    /**
-	 */
+     * 导出数据
-	@IsAdmin
+     */
-	@GetMapping("/export-dsProcessProject")
+    @IsAdmin
-	@ApiOperationSupport(order = 9)
+    @GetMapping("/export-dsProcessProject")
-	@Operation(summary = "导出数据", description  = "传入dsProcessProject")
+    @ApiOperationSupport(order = 9)
-	public void exportDsProcessProject(@Parameter(hidden = true) @RequestParam Map<String, Object> dsProcessProject, BladeUser bladeUser, HttpServletResponse response) {
+    @Operation(summary = "导出数据", description = "传入dsProcessProject")
-		QueryWrapper<DsProcessProjectEntity> queryWrapper = Condition.getQueryWrapper(dsProcessProject, DsProcessProjectEntity.class);
+    public void exportDsProcessProject(@Parameter(hidden = true) @RequestParam Map<String, Object> dsProcessProject, BladeUser bladeUser, HttpServletResponse response) {
-		//if (!AuthUtil.isAdministrator()) {
+        QueryWrapper<DsProcessProjectEntity> queryWrapper = Condition.getQueryWrapper(dsProcessProject, DsProcessProjectEntity.class);
-		//	queryWrapper.lambda().eq(DsProcessProject::getTenantId, bladeUser.getTenantId());
+        //if (!AuthUtil.isAdministrator()) {
-		//}
+        //	queryWrapper.lambda().eq(DsProcessProject::getTenantId, bladeUser.getTenantId());
-		//queryWrapper.lambda().eq(DsProcessProjectEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+        //}
-		List<DsProcessProjectExcel> list = dsProcessProjectService.exportDsProcessProject(queryWrapper);
+        //queryWrapper.lambda().eq(DsProcessProjectEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		ExcelUtil.export(response, "工序项目信息表数据" + DateUtil.time(), "工序项目信息表数据表", list, DsProcessProjectExcel.class);
+        List<DsProcessProjectExcel> list = dsProcessProjectService.exportDsProcessProject(queryWrapper);
-	}
+        ExcelUtil.export(response, "工序项目信息表数据" + DateUtil.time(), "工序项目信息表数据表", list, DsProcessProjectExcel.class);
+    }
 
 }

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

@@ -37,6 +37,7 @@ import org.springblade.desk.produce.pojo.vo.BindModelVO;
 import org.springblade.desk.produce.pojo.vo.LoadSubOrderVO;
 import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO;
 import org.springblade.desk.produce.service.*;
+import org.springblade.desk.quality.constant.InspectionTaskConst;
 import org.springblade.desk.quality.pojo.entity.InspectionItem;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
@@ -417,9 +418,14 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         boolean save = inspectionTaskService.save(inspectionTask);
         if (CollectionUtils.isNotEmpty(inspectionTask.getWpItemList())) {
             List<InspectionItem> inspectionItems = inspectionItemService.list();
+//            double sumCheckQty = 0, sumTestQty = 0, sumLossQty = 0;
             for (WorkPlanItemVO workPlanItemVO : inspectionTask.getWpItemList()) {
+//                sumCheckQty += workPlanItemVO.getCheckQty() != null ? workPlanItemVO.getCheckQty() : 0;
+//                sumTestQty += workPlanItemVO.getTestQty() != null ? workPlanItemVO.getTestQty() : 0;
+//                sumLossQty += workPlanItemVO.getLossQty() != null ? workPlanItemVO.getLossQty() : 0;
                 WorkPlanItem workPlanItem = new WorkPlanItem();
                 BeanUtils.copyProperties(workPlanItemVO, workPlanItem);
+                workPlanItem.setWpId(inspectionTask.getWpId());
                 workPlanItem.setTaskId(inspectionTask.getId());
                 // 检验项目基础数据中项目名称匹配
                 for (InspectionItem inspectionItem : inspectionItems) {
@@ -440,7 +446,15 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
                     }
                 }
             }
+//            inspectionTask.setScrapQty(0d);
+//            inspectionTask.setCheckQty(sumCheckQty);
+//            inspectionTask.setLossQty(sumLossQty);
+//            inspectionTaskService.updateById(inspectionTask);
         }
+
+//        if (inspectionTask.getCheckResult() == InspectionTaskConst.CHECK_RESULT_NG) {
+//            inspectionTaskService.addRsSheet(inspectionTask.getId());
+//        }
         // 刷新状态和数量
         inspectionTaskService.refreshStatusAndQty(inspectionTask.getId());
         // 保存镀后检验数据

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

@@ -55,184 +55,196 @@ import java.util.stream.Collectors;
 public class WorkPlanItemController extends BladeController {
 
     @Resource
-	private IWorkPlanItemService service;
+    private IWorkPlanItemService service;
-
+
-	/**
+    /**
-	 * [工序检验项] 详情
+     * [工序检验项] 详情
-	 */
+     */
-	@GetMapping("/detail")
+    @GetMapping("/detail")
-	@ApiOperationSupport(order = 10)
+    @ApiOperationSupport(order = 10)
-	@Operation(summary = "详情", description  = "传入WorkPlanItem Obj")
+    @Operation(summary = "详情", description = "传入WorkPlanItem Obj")
-	public R<WorkPlanItemVO> detail(WorkPlanItem workPlanItem) {
+    public R<WorkPlanItemVO> detail(WorkPlanItem workPlanItem) {
-	    QueryWrapper<WorkPlanItem> qw = Condition.getQueryWrapper(workPlanItem);
+        QueryWrapper<WorkPlanItem> qw = Condition.getQueryWrapper(workPlanItem);
-		WorkPlanItem detail = service.getOne(qw);
+        WorkPlanItem detail = service.getOne(qw);
-		WorkPlanItemVO detailVO = WorkPlanItemWrapper.build().entityVO(detail);
+        WorkPlanItemVO detailVO = WorkPlanItemWrapper.build().entityVO(detail);
-		service.setVOValue(detailVO);
+        service.setVOValue(detailVO);
-		return R.data(detailVO);
+        return R.data(detailVO);
-	}
+    }
-
+
-	/**
+    /**
-	 * [工序检验项] list分页
+     * [工序检验项] list分页
-	 */
+     */
-	@GetMapping("/list")
+    @GetMapping("/list")
-	@ApiOperationSupport(order = 20)
+    @ApiOperationSupport(order = 20)
-	@Operation(summary = "list分页", description  = "传入WorkPlanItem Obj")
+    @Operation(summary = "list分页", description = "传入WorkPlanItem Obj")
-	public R<IPage<WorkPlanItemVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> workPlanItem,
+    public R<IPage<WorkPlanItemVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> workPlanItem,
-	                                        Query query) {
+                                         Query query) {
         QueryWrapper<WorkPlanItem> qw = Condition.getQueryWrapper(workPlanItem, WorkPlanItem.class);
-		IPage<WorkPlanItem> pages = service.page(Condition.getPage(query), qw);
+        IPage<WorkPlanItem> pages = service.page(Condition.getPage(query), qw);
-		IPage<WorkPlanItemVO> pagesVO = WorkPlanItemWrapper.build().pageVO(pages);
+        IPage<WorkPlanItemVO> pagesVO = WorkPlanItemWrapper.build().pageVO(pages);
-		pagesVO.getRecords()
+        pagesVO.getRecords()
-               .stream()
+                .stream()
-               .peek(service::setVOValue)
+                .peek(service::setVOValue)
-               .collect(Collectors.toList());
+                .collect(Collectors.toList());
-		return R.data(pagesVO);
+        return R.data(pagesVO);
-	}
+    }
-
+
-
+
-	/**
+    /**
-	 * [工序检验项] page分页
+     * [工序检验项] page分页
-	 */
+     */
-	@GetMapping("/page")
+    @GetMapping("/page")
-	@ApiOperationSupport(order = 21)
+    @ApiOperationSupport(order = 21)
-	@Operation(summary = "page分页", description  = "传入WorkPlanItem Obj")
+    @Operation(summary = "page分页", description = "传入WorkPlanItem Obj")
-	public R<IPage<WorkPlanItemVO>> page(WorkPlanItemVO workPlanItem, Query query) {
+    public R<IPage<WorkPlanItemVO>> page(WorkPlanItemVO workPlanItem, Query query) {
-		IPage<WorkPlanItemVO> pagesVO = service.selectWorkPlanItemPage(
+        IPage<WorkPlanItemVO> pagesVO = service.selectWorkPlanItemPage(
-		    Condition.getPage(query), workPlanItem
+                Condition.getPage(query), workPlanItem
-		);
+        );
-		return R.data(pagesVO);
+        return R.data(pagesVO);
-	}
+    }
-
+
-	/**
+    /**
      * [工序检验项] list下拉选择
      */
     @GetMapping("/listForSelect")
     @ApiOperationSupport(order = 22)
-    @Operation(summary = "list下拉选择", description  = "")
+    @Operation(summary = "list下拉选择", description = "")
     public R<List<WorkPlanItemVO>> listForSelect() {
-         List<WorkPlanItem> list = service.list();
+        List<WorkPlanItem> list = service.list();
-         List<WorkPlanItemVO> listVO = WorkPlanItemWrapper.build().listVO(list);
+        List<WorkPlanItemVO> listVO = WorkPlanItemWrapper.build().listVO(list);
-         return R.data(listVO);
+        return R.data(listVO);
     }
 
-	/**
+    /**
-	 * [工序检验项] 新增一条
+     * [工序检验项] 新增一条
-	 */
+     */
-	@PostMapping("/save")
+    @PostMapping("/save")
-	@ApiOperationSupport(order = 30)
+    @ApiOperationSupport(order = 30)
-	@Operation(summary = "新增一条", description  = "传入WorkPlanItem Obj")
+    @Operation(summary = "新增一条", description = "传入WorkPlanItem Obj")
-	public R save(@Valid @RequestBody WorkPlanItem addOne) {
+    public R save(@Valid @RequestBody WorkPlanItem addOne) {
-	    addOne.setId(null);
+        addOne.setId(null);
-		return R.status(service.save(addOne));
+        return R.status(service.save(addOne));
-	}
+    }
-
+
-	/**
+    /**
      * [工序检验项] 新增批量
      */
-     @PostMapping("/saveBat")
+    @PostMapping("/saveBat")
-     @ApiOperationSupport(order = 31)
+    @ApiOperationSupport(order = 31)
-     @Operation(summary = "新增批量", description = "传入WorkPlanItem List")
+    @Operation(summary = "新增批量", description = "传入WorkPlanItem List")
-     public R saveBat(@Valid @RequestBody List<WorkPlanItem> addList) {
+    public R saveBat(@Valid @RequestBody List<WorkPlanItem> addList) {
-         addList.forEach(one -> {
+        addList.forEach(one -> {
-             one.setId(null);
+            one.setId(null);
-         });
+        });
-         return R.status(service.saveBatch(addList));
+        return R.status(service.saveBatch(addList));
-     }
+    }
-
+
-	/**
+    /**
-	 * [工序检验项] 修改一条
+     * [工序检验项] 修改一条
-	 */
+     */
-	@PostMapping("/update")
+    @PostMapping("/update")
-	@ApiOperationSupport(order = 40)
+    @ApiOperationSupport(order = 40)
-	@Operation(summary = "修改一条", description  = "传入WorkPlanItem Obj")
+    @Operation(summary = "修改一条", description = "传入WorkPlanItem Obj")
-	public R update(@Valid @RequestBody WorkPlanItem updateOne) {
+    public R update(@Valid @RequestBody WorkPlanItem updateOne) {
-		return R.status(service.updateById(updateOne));
+        return R.status(service.updateById(updateOne));
-	}
+    }
 
     /**
      * [工序检验项] 修改批量
      */
     @PostMapping("/updateBat")
     @ApiOperationSupport(order = 41)
-    @Operation(summary = "修改批量", description  = "传入WorkPlanItem List")
+    @Operation(summary = "修改批量", description = "传入WorkPlanItem List")
     public R updateBat(@Valid @RequestBody List<WorkPlanItem> updateList) {
         return R.status(service.updateBatchById(updateList));
     }
 
-	/**
+    /**
-	 * [工序检验项] 新增或修改一条
+     * [工序检验项] 新增或修改一条
-	 */
+     */
-	@PostMapping("/submit")
+    @PostMapping("/submit")
-	@ApiOperationSupport(order = 50)
+    @ApiOperationSupport(order = 50)
-	@Operation(summary = "新增或修改一条", description  = "传入WorkPlanItem Obj")
+    @Operation(summary = "新增或修改一条", description = "传入WorkPlanItem Obj")
-	public R submit(@Valid @RequestBody WorkPlanItem mergeOne) {
+    public R submit(@Valid @RequestBody WorkPlanItem mergeOne) {
-		return R.status(service.saveOrUpdate(mergeOne));
+        return R.status(service.saveOrUpdate(mergeOne));
-	}
+    }
-
+
-	/**
+    /**
      * [工序检验项] 新增或修改批量
      */
-     @PostMapping("/submitBat")
+    @PostMapping("/submitBat")
-     @ApiOperationSupport(order = 51)
+    @ApiOperationSupport(order = 51)
-     @Operation(summary = "新增或修改批量", description = "传入WorkPlanItem List")
+    @Operation(summary = "新增或修改批量", description = "传入WorkPlanItem List")
-     public R submitBat(@Valid @RequestBody List<WorkPlanItem> mergeList) {
+    public R submitBat(@Valid @RequestBody List<WorkPlanItem> mergeList) {
-         return R.status(service.saveOrUpdateBatch(mergeList));
+        return R.status(service.saveOrUpdateBatch(mergeList));
-     }
+    }
-
+
-	/**
+    /**
-	 * [工序检验项] 逻辑删除
+     * [工序检验项] 逻辑删除
-	 */
+     */
-	@PostMapping("/remove")
+    @PostMapping("/remove")
-	@ApiOperationSupport(order = 61)
+    @ApiOperationSupport(order = 61)
-	@Operation(summary = "逻辑删除", description  = "传入ids")
+    @Operation(summary = "逻辑删除", description = "传入ids")
-	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+    public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(service.deleteLogic(Func.toLongList(ids)));
+        return R.status(service.deleteLogic(Func.toLongList(ids)));
-	}
+    }
-
+
-	/**
+    /**
-	 * [工序检验项] 导出Excel
+     * [工序检验项] 导出Excel
-	 */
+     */
-	@GetMapping("/exportExcel")
+    @GetMapping("/exportExcel")
-	@ApiOperationSupport(order = 70)
+    @ApiOperationSupport(order = 70)
-	@Operation(summary = "导出Excel", description  = "传入WorkPlanItem")
+    @Operation(summary = "导出Excel", description = "传入WorkPlanItem")
-	public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> workPlanItem,
+    public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> workPlanItem,
-	                                BladeUser bladeUser, HttpServletResponse response) {
+                            BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<WorkPlanItem> qw = Condition.getQueryWrapper(workPlanItem, WorkPlanItem.class);
+        QueryWrapper<WorkPlanItem> qw = Condition.getQueryWrapper(workPlanItem, WorkPlanItem.class);
-		//if (!AuthUtil.isAdministrator()) {
+        //if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(WorkPlanItem::getTenantId, bladeUser.getTenantId());
+        //	queryWrapper.lambda().eq(WorkPlanItem::getTenantId, bladeUser.getTenantId());
-		//}
+        //}
-		//queryWrapper.lambda().eq(WorkPlanItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+        //queryWrapper.lambda().eq(WorkPlanItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<WorkPlanItemExcel> list = service.exportWorkPlanItem(qw);
+        List<WorkPlanItemExcel> list = service.exportWorkPlanItem(qw);
-		ExcelUtil.export(response, "[工序检验项]数据" + DateUtil.time(),
+        ExcelUtil.export(response, "[工序检验项]数据" + DateUtil.time(),
-		                "[工序检验项]数据表", list, WorkPlanItemExcel.class);
+                "[工序检验项]数据表", list, WorkPlanItemExcel.class);
-	}
+    }
-
+
-	/**
+    /**
      * [工序检验项] 下载Excel模板
      */
-     @GetMapping("/downloadExcelTemplate")
+    @GetMapping("/downloadExcelTemplate")
-     @ApiOperationSupport(order = 71)
+    @ApiOperationSupport(order = 71)
-     @Operation(summary = "下载Excel模板", description = "")
+    @Operation(summary = "下载Excel模板", description = "")
-     public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
+    public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
-            return ExcelExtUtil.downloadXlsTemplate(
+        return ExcelExtUtil.downloadXlsTemplate(
-                    "Excel/QA/ImportTemplate-CycleTestItem.xls",
+                "Excel/QA/ImportTemplate-CycleTestItem.xls",
-                    "导入模版-周期试验项目.xls");
+                "导入模版-周期试验项目.xls");
-     }
+    }
-
+
-     /**
+    /**
-      * [工序检验项] 导入Excel
+     * [工序检验项] 导入Excel
-      */
+     */
-      @PostMapping("/importExcel")
+    @PostMapping("/importExcel")
-      @ApiOperationSupport(order = 72)
+    @ApiOperationSupport(order = 72)
-      @Operation(summary = "导入Excel", description = "MultipartFile")
+    @Operation(summary = "导入Excel", description = "MultipartFile")
-      public R importExcel(@RequestParam("file") MultipartFile file) {
+    public R importExcel(@RequestParam("file") MultipartFile file) {
-          R checkR = ExcelExtUtil.importExcelCheck(file);
+        R checkR = ExcelExtUtil.importExcelCheck(file);
-          if (checkR != null) {
+        if (checkR != null) {
-              return checkR;
+            return checkR;
-          }
+        }
-          List<WorkPlanItem> importList = ExcelUtil.read(
+        List<WorkPlanItem> importList = ExcelUtil.read(
-                     file, 0, 1, WorkPlanItem.class
+                file, 0, 1, WorkPlanItem.class
-          );
+        );
-          return R.status(service.saveBatch(importList));
+        return R.status(service.saveBatch(importList));
-      }
+    }
+
+    /**
+     * 根据id查询同订单共享值
+     *
+     * @param workPlanItem
+     * @return
+     */
+    @GetMapping("/listShareVOByWpiId")
+    @Operation(summary = "根据ID查询同订单共享值", description = "传入WorkPlanItem Obj")
+    public R listShareVOByWpiId(WorkPlanItem workPlanItem) {
+        return R.data(service.listShareVOByWpiId(workPlanItem.getId()));
+    }
 }

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

@@ -41,4 +41,6 @@ public interface WorkPlanItemMapper extends BaseMapper<WorkPlanItem> {
     List<WorkPlanItem> listByWoId(Long woId);
 
 	List<WorkPlanItemVO> listByWoIdNotNG(Long woId);
+
+    List<WorkPlanItem> listShareByWpiId(Long wpiId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml

@@ -65,4 +65,21 @@
         AND b.wo_id = #{woId}
         AND a.CHECK_RESULT != 3
     </select>
+
+    <select id="listShareByWpiId" resultMap="workPlanItemResultMap">
+        SELECT a.*
+        FROM QA_WORK_PLAN_ITEM a
+        LEFT JOIN MES_WORK_PLAN b ON a.WP_ID = b.ID
+        INNER JOIN (
+            SELECT t.item_name, m.WO_ID, t.COATING_TYPE
+            FROM QA_WORK_PLAN_ITEM t
+            LEFT JOIN MES_WORK_PLAN m ON t.WP_ID = m.ID
+            WHERE t.id = #{wpiId}
+        ) cond
+        ON a.item_name = cond.item_name
+        AND a.COATING_TYPE = cond.COATING_TYPE
+        AND b.WO_ID = cond.WO_ID
+        WHERE a.is_deleted = 0 AND a.SOURCE_TYPE = 1
+    </select>
+
 </mapper>

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

@@ -65,4 +65,6 @@ public interface IWorkPlanItemService extends BaseService<WorkPlanItem> {
 	List<WorkPlanItemVO> listByWoIdNotNG(Long woId);
 
 	List<WorkPlanItemVO> listVOByWpIdAndItemName(Long wpId, String itemName);
+
+	List<WorkPlanItemVO> listShareVOByWpiId(Long wpiId);
 }

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

@@ -2359,15 +2359,15 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
     @Override
     public void computeOrderQty(WorkPlan wp, InspectionTask wc, WorkOrder wo, int checkQ, int testQty, int lossQty, int scrapQty) {
         if (wc != null) {
-            wc.setScrapQty(wc.getScrapQty() + scrapQty);
+            wc.setScrapQty(Optional.ofNullable(wc.getScrapQty()).orElse(0D) + scrapQty);
-            wc.setCheckQty(wc.getCheckQty() + checkQ);
+            wc.setCheckQty(Optional.ofNullable(wc.getCheckQty()).orElse(0D) + checkQ);
-            wc.setLossQty(wc.getLossQty() + lossQty);
+            wc.setLossQty(Optional.ofNullable(wc.getLossQty()).orElse(0D) + lossQty);
         }
         if (wo != null) {
-            wo.setMakeQty(wo.getMakeQty() - (testQty + lossQty + scrapQty));
+            wo.setMakeQty(Optional.ofNullable(wo.getMakeQty()).orElse(0D) - (testQty + lossQty + scrapQty));
-            wo.setTestQty(wo.getTestQty() + testQty);
+            wo.setTestQty(Optional.ofNullable(wo.getTestQty()).orElse(0D) + testQty);
-            wo.setLossQty(wo.getLossQty() + lossQty);
+            wo.setLossQty(Optional.ofNullable(wo.getLossQty()).orElse(0D) + lossQty);
-            wo.setScrapQty(wo.getScrapQty() + scrapQty);
+            wo.setScrapQty(Optional.ofNullable(wo.getScrapQty()).orElse(0D) + scrapQty);
             log.info("车间订单:{}, 扣除测试数量:{}", wo.getWoCode(), wo.getTestQty());
         }
 
@@ -2380,9 +2380,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             if (list != null && list.size() > 0) {
                 wp.setWorkQty(wo.getMakeQty());
             }
-            wp.setTestQty(wp.getTestQty() + testQty);
+            wp.setTestQty(Optional.ofNullable(wp.getTestQty()).orElse(0D) + testQty);
-            wp.setLossQty(wp.getLossQty() + lossQty);
+            wp.setLossQty(Optional.ofNullable(wp.getLossQty()).orElse(0D) + lossQty);
-            wp.setScrapQty(wp.getScrapQty() + scrapQty);
+            wp.setScrapQty(Optional.ofNullable(wp.getScrapQty()).orElse(0D) + scrapQty);
         }
     }
 

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

@@ -115,7 +115,11 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
         }
 
         if(vo.getItem() != null){
-            List<WorkPlanItemDetailVO> list =  wpItemDetailService.listVOByWorkPlanItemId(vo.getId());
+            Long sourceId = vo.getId();
+            if(vo.getSourceType() == WorkPlanItemVO.SHARE_SOURCE){
+                sourceId = vo.getSourceId();
+            }
+            List<WorkPlanItemDetailVO> list =  wpItemDetailService.listVOByWorkPlanItemId(sourceId);
             if(null == list || list.size() == 0){
                 vo.setWpItemDetailList(new ArrayList<>());
             }else{
@@ -265,4 +269,14 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
         }
         return listVO;
     }
+
+    @Override
+    public List<WorkPlanItemVO> listShareVOByWpiId(Long wpiId) {
+        List<WorkPlanItem> list = baseMapper.listShareByWpiId(wpiId);
+        List<WorkPlanItemVO> listVO = WorkPlanItemWrapper.build().listVO(list);
+        for (WorkPlanItemVO vo : listVO) {
+            setVOValue(vo);
+        }
+        return listVO;
+    }
 }