diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java index dcca6808e..e27a73781 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java @@ -78,6 +78,18 @@ public class WorkPlanItemVO extends WorkPlanItem { @Schema(description = "来源类型值") private String sourceTypeValue; + @Schema(description = "车间订单号") + private String woCode; + + @Schema(description = "工序编码") + private String processCode; + + @Schema(description = "工序名称") + private String processName; + + @Schema(description = "检查结果") + private String checkResultValue; + public String getCoatingTypeValue(){ return coatTypeMap.get(getCoatingType()); } @@ -85,4 +97,8 @@ public class WorkPlanItemVO extends WorkPlanItem { public String getSourceTypeValue() { return sourceTypeMap.get(getSourceType()); } + + public String getCheckResultValue() { + return checkResultMap.get(getCheckResult()); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java index 499001f43..ab3d61d1f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java @@ -42,5 +42,5 @@ public interface WorkPlanItemMapper extends BaseMapper { List listByWoIdNotNG(Long woId); - List listShareByWpiId(Long wpiId); + List listShareByWpiId(Long wpiId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml index 020e5ca71..39761c0d0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml @@ -30,6 +30,12 @@ + + + + + + - + SELECT a.*, c.WO_CODE, d.CODE as PROCESS_CODE, d.NAME as PROCESS_NAME FROM QA_WORK_PLAN_ITEM a LEFT JOIN MES_WORK_PLAN b ON a.WP_ID = b.ID + LEFT JOIN MES_WORK_ORDER c ON b.WO_ID = c.ID + LEFT JOIN BS_PROCESS_SET d ON b.PPS_ID = d.ID INNER JOIN ( SELECT t.item_name, m.WO_ID, t.COATING_TYPE FROM QA_WORK_PLAN_ITEM t diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java index d005b474e..0f64c17d3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java @@ -94,12 +94,13 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl rUI = userClient.userInfo(vo.getCheckUserId()); if (rUI != null && rUI.isSuccess() && rUI.getData().getUser() != null) { vo.setCheckUserRealName(rUI.getData().getUser().getRealName()); - }else{ - vo.setCheckUserRealName(""); } + } else { + vo.setCheckUserRealName(""); + } } { InspectionItem item = inspectionItemService.getById(vo.getItemId()); - if(item != null){ + if (item != null) { InspectionItemVO itemVO = InspectionItemWrapper.build().entityVO(item); inspectionItemService.setVOValue(itemVO); vo.setItem(itemVO); @@ -107,28 +108,29 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl list = wpItemDetailService.listVOByWorkPlanItemId(sourceId); - if(null == list || list.size() == 0){ + List list = wpItemDetailService.listVOByWorkPlanItemId(sourceId); + if (null == list || list.size() == 0) { vo.setWpItemDetailList(new ArrayList<>()); - }else{ + } else { vo.setWpItemDetailList(list); } } vo.setCoatingTypeValue(vo.getCoatingTypeValue()); vo.setSourceTypeValue(vo.getSourceTypeValue()); + vo.setCheckResultValue(vo.getCheckResultValue()); // if (vo.getItem() != null && vo.getItem().getSpecialType() != null) { // if (InspectionItemConst.SPECIAL_TYPE_THICK.equals(vo.getItem().getSpecialType()) || @@ -257,7 +259,7 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl listVOByWpIdAndItemName(Long wpId, String itemName){ + public List listVOByWpIdAndItemName(Long wpId, String itemName) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); qw.eq(WorkPlanItem::getWpId, wpId); qw.eq(WorkPlanItem::getItemName, itemName); @@ -272,11 +274,11 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl listShareVOByWpiId(Long wpiId) { - List list = baseMapper.listShareByWpiId(wpiId); - List listVO = WorkPlanItemWrapper.build().listVO(list); + List listVO = baseMapper.listShareByWpiId(wpiId); for (WorkPlanItemVO vo : listVO) { setVOValue(vo); } return listVO; } + }