diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java index ff1795f4..20b446c8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -125,4 +125,6 @@ public class InspectionTaskListVO extends InspectionTask { private Integer yieldType; + private Long wpId; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index 8b465963..3d488d5a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -294,7 +294,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 94fa00c6..82564f24 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -54,13 +54,16 @@ import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskSubPartVO; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.IReviewSheetSubService; +import org.springblade.desk.quality.service.IWorkPlanItemService; import org.springblade.desk.quality.service.InspectionTaskService2; import org.springblade.desk.quality.wrapper.InspectionTaskDetailWrapper; import org.springframework.beans.BeanUtils; @@ -107,6 +110,8 @@ public class InspectionTaskController extends BladeController { private IYieldOrderService yieldOrderService; @Resource private WorkPlanMapper workPlanMapper; + @Resource + private IWorkPlanItemService workPlanItemService; /** * [检验任务] 详情 */ @@ -122,6 +127,39 @@ public class InspectionTaskController extends BladeController { return R.data(detailDetailVO); } + @GetMapping("/getItems") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入inspectionTask") + public R> getItems(Long wpId) { +// WorkPlan plan = workPlanService.getById(wpId); + +// QueryWrapper qw = new QueryWrapper<>(); +// qw.eq("WP_ID", wpId); +// List list = service.list(qw); +//// InspectionTask inspectionTask = new InspectionTask(); +//// if(null != list && list.size() > 0){ +//// inspectionTask = list.get(0); +//// } +// +// List all = new ArrayList<>(); +// +// for(InspectionTask inspectionTask : list){ +// InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); +// InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); +//// InspectionTaskListVO detailDetail = service.detailById(inspectionTask); +// service.setDetailVOValueNew(detailDetailVO); +// List items = detailDetailVO.getWpItemList(); +// all.addAll(items); +// } + + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("WP_ID", wpId); + List list = workPlanItemService.list(qw); + + return R.data(list); + } + + @GetMapping("/detailMut") @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入inspectionTask") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index e2fa6698..f22282e6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -256,6 +256,7 @@ wo.MAKE_QTY AS poQty, wo.WO_CODE AS woCode, wo.PART_CODE AS partCode, + wp.Id as wpId, wo.CARD_NO AS cardNo FROM MES_WORK_ORDER wo -- 车间作业计划 wp diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java index 7ae11ed3..71f1b9e8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java @@ -57,6 +57,7 @@ public interface IInspectionTaskService extends BaseService { * @param vo */ void setDetailVOValue(InspectionTaskDetailVO vo); + void setDetailVOValueNew(InspectionTaskDetailVO vo); /** * VO diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java index 8c4ac84d..9772b7ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java @@ -49,6 +49,9 @@ public interface IWorkPlanItemService extends BaseService { List listVOByTaskId(Long taskId); + List listVOByTaskIdNew(Long taskId); + + void saveCheckItem(WorkPlan wp, List checkItemList, List deleteIds, String s); void deleteItem(List deleteIds); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 46cd62de..02269436 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -197,6 +197,11 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl listVOByTaskIdNew(Long taskId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(WorkPlanItem::getTaskId, taskId); + qw.like(WorkPlanItem::getSpecialType, 1); + qw.orderByAsc(WorkPlanItem::getItemCode); + List list = list(qw); + List listVO = WorkPlanItemWrapper.build().listVO(list); +// for (WorkPlanItemVO vo : listVO) { +// setVOValue(vo); +// } + return listVO; + } + @Override public void saveCheckItem(WorkPlan wp, List checkItemList, List deleteIds, String s) { if (checkItemList != null) {