电子档案

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -730,7 +730,8 @@
         SELECT a.*, b.NAME as PPS_NAME, bu.real_name as CREATE_MAN
         FROM MES_WORK_PLAN a
         INNER JOIN BS_PROCESS_SET b ON a.PPS_ID = b.ID AND b.IS_DELETED = 0
-        INNER JOIN BLADE_USER bu on a.create_user = bu.ID AND bu.IS_DELETED = 0
+        LEFT JOIN BLADE_USER bu on a.create_user = bu.ID AND bu.IS_DELETED = 0
         WHERE a.IS_DELETED = 0 and a.WO_ID = #{woId}
+        ORDER BY a.orders asc
     </select>
 </mapper>

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

@@ -328,7 +328,7 @@
         wo.CARD_NO AS cardNo
         FROM MES_WORK_ORDER wo
         -- 车间作业计划 wp
-        LEFT JOIN MES_WORK_PLAN wp ON wp.WO_ID = wo.ID
+        LEFT JOIN MES_WORK_PLAN wp ON wo.WP_ID = wp.ID
         -- 生产订单 yo
         LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID
         -- 工序
@@ -401,12 +401,12 @@
         ps.CODE AS ppsCode
         FROM MES_WORK_ORDER wo
         -- 车间作业计划 wp
-        LEFT JOIN MES_WORK_PLAN wp ON wp.WO_ID = wo.ID
+        INNER JOIN MES_WORK_PLAN wp ON wp.WO_ID = wo.ID
         -- 工序
-        LEFT JOIN BS_PROCESS_SET ps ON wp.ORDERS = ps.CODE
+        INNER JOIN BS_PROCESS_SET ps ON wp.pps_id = ps.id
         WHERE
         wo.IS_DELETED = 0 and wo.id = #{woId}
-
+        ORDER BY wp.orders ASC
     </select>
 
 </mapper>

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

@@ -692,19 +692,25 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         JSONObject yoJson = new JSONObject();
         JSONObject partJson = new JSONObject();
         JSONObject modelJson = new JSONObject();
-        partJson.put("partCode", dsPart.getPartCode());
-        partJson.put("partName", dsPart.getPartName());
-        partJson.put("hardness", dsPart.getHardness());
-        partJson.put("plate", dsPart.getPlate());
-        partJson.put("material", dsPart.getMaterial());
-        partJson.put("cruxMemo", dsPart.getKeyInfo());
-        partJson.put("memo", dsPart.getRemarks());
-        yoJson.put("productType", yo.getProductType());
-        yoJson.put("prodIdent", yo.getProductIdent());
-        yoJson.put("poQty", yo.getYpQty());
-        yoJson.put("poArea", yo.getYpArea());
-        yoJson.put("primaryCraft", yo.getPrimaryCraft());
-        woJson.put("batchNo", wo.getBatchNo());
+        if(dsPart != null){
+            partJson.put("partCode", dsPart.getPartCode());
+            partJson.put("partName", dsPart.getPartName());
+            partJson.put("hardness", dsPart.getHardness());
+            partJson.put("plate", dsPart.getPlate());
+            partJson.put("material", dsPart.getMaterial());
+            partJson.put("cruxMemo", dsPart.getKeyInfo());
+            partJson.put("memo", dsPart.getRemarks());
+        }
+        if(yo != null){
+            yoJson.put("productType", yo.getProductType());
+            yoJson.put("prodIdent", yo.getProductIdent());
+            yoJson.put("poQty", yo.getYpQty());
+            yoJson.put("poArea", yo.getYpArea());
+            yoJson.put("primaryCraft", yo.getPrimaryCraft());
+        }
+        if(wo != null){
+            woJson.put("batchNo", wo.getBatchNo());
+        }
         woJson.put("pjYieldOrder", yoJson);
         modelJson.put("wo", woJson);
         modelJson.put("dsPart", partJson);