生产质量检验

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());
+    }
 }

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

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

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

@@ -30,6 +30,12 @@
         <result column="SOURCE_ORDERS" property="sourceOrders"/>
     </resultMap>
 
+    <resultMap id="workPlanItemVOResultMap" type="org.springblade.desk.quality.pojo.vo.WorkPlanItemVO" extends="workPlanItemResultMap">
+        <result column="WO_CODE" property="woCode"/>
+        <result column="PROCESS_CODE" property="processCode"/>
+        <result column="PROCESS_NAME" property="processName"/>
+    </resultMap>
+
     <select id="selectWorkPlanItemPage" resultMap="workPlanItemResultMap">
         SELECT *
         FROM QA_WORK_PLAN_ITEM
@@ -66,10 +72,12 @@
         AND a.CHECK_RESULT != 3
     </select>
 
-    <select id="listShareByWpiId" resultMap="workPlanItemResultMap">
+    <select id="listShareByWpiId" resultMap="workPlanItemVOResultMap">
-        SELECT a.*
+        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

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

@@ -94,12 +94,13 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
             R<UserInfo> rUI = userClient.userInfo(vo.getCheckUserId());
             if (rUI != null && rUI.isSuccess() && rUI.getData().getUser() != null) {
                 vo.setCheckUserRealName(rUI.getData().getUser().getRealName());
-            }else{
+            } else {
-                vo.setCheckUserRealName("");            }
+                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<WorkPlanItemMapper,
         }
         {
             Standard standard = standardService.getById(vo.getStandardId());
-            if(standard != null){
+            if (standard != null) {
                 StandardVO standardVO = StandardWrapper.build().entityVO(standard);
                 standardService.setVOValue(standardVO);
                 vo.setStandard(standardVO);
             }
         }
 
-        if(vo.getItem() != null){
+        if (vo.getItem() != null) {
             Long sourceId = vo.getId();
-            if(vo.getSourceType() == WorkPlanItemVO.SHARE_SOURCE){
+            if (vo.getSourceType() == WorkPlanItemVO.SHARE_SOURCE) {
                 sourceId = vo.getSourceId();
             }
-            List<WorkPlanItemDetailVO> list =  wpItemDetailService.listVOByWorkPlanItemId(sourceId);
+            List<WorkPlanItemDetailVO> list = wpItemDetailService.listVOByWorkPlanItemId(sourceId);
-            if(null == list || list.size() == 0){
+            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<WorkPlanItemMapper,
     }
 
     @Override
-    public List<WorkPlanItemVO> listVOByWpIdAndItemName(Long wpId, String itemName){
+    public List<WorkPlanItemVO> listVOByWpIdAndItemName(Long wpId, String itemName) {
         LambdaQueryWrapper<WorkPlanItem> qw = Wrappers.lambdaQuery();
         qw.eq(WorkPlanItem::getWpId, wpId);
         qw.eq(WorkPlanItem::getItemName, itemName);
@@ -272,11 +274,11 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
 
     @Override
     public List<WorkPlanItemVO> listShareVOByWpiId(Long wpiId) {
-        List<WorkPlanItem> list = baseMapper.listShareByWpiId(wpiId);
+        List<WorkPlanItemVO> listVO = baseMapper.listShareByWpiId(wpiId);
-        List<WorkPlanItemVO> listVO = WorkPlanItemWrapper.build().listVO(list);
         for (WorkPlanItemVO vo : listVO) {
             setVOValue(vo);
         }
         return listVO;
     }
+
 }