匹配标准工序代码

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml

@@ -331,21 +331,17 @@
     <select id="selectErrorStatements" resultMap="StatementVOResultMap">
         SELECT
             h.ID,
-            a.pps_id as ps_id,
-            e.PART_CODE,
-            p.PART_NAME,
-            e.PLATE,
-            e.PLATE_THICKNESS1 as PLATE_THICKNESS,
+            h.pps_id AS ps_id,
+            h.ps_name,
+            h.PART_CODE,
+            h.PART_NAME,
+            h.PLATE,
+            h.ROS_THICKNESS as PLATE_THICKNESS,
             h.ROS_STATUS,
             h.MEMO,
             h.STANDARD_PROCESS_CODE
-        FROM MES_OEM_STATEMENT h
-        INNER JOIN MES_WORK_PLAN a ON h.WP_ID = a.ID AND a.IS_DELETED = 0
-        INNER JOIN BS_PROCESS_SET b ON a.PPS_ID = b.ID AND b.IS_DELETED = 0
-        INNER JOIN MES_WORK_ORDER d ON a.WO_ID = d.ID AND d.IS_DELETED = 0
-        INNER JOIN MES_YIELD_ORDER e ON d.YO_ID = e.ID AND e.IS_DELETED = 0
-        INNER JOIN DS_PART_VERSION pv ON e.part_code = pv.part_code AND e.part_version = pv.part_version AND pv.IS_DELETED = 0
-        INNER JOIN DS_PART p ON pv.PART_ID = p.ID AND p.IS_DELETED = 0
+        FROM
+            MES_OEM_STATEMENT h
         WHERE h.IS_DELETED = 0
           AND h.ROS_STATUS = 3
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -1400,6 +1400,9 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         for (Map.Entry<String, List<StatementVO>> entry : groupByPsName.entrySet()) {
             String psName = entry.getKey();
             List<OemStandardProcessEntity> standardProcessList = standardMap.getOrDefault(psName, Collections.emptyList());
+            if(CollectionUtils.isEmpty(standardProcessList)){
+                continue;
+            }
             for (StatementVO statementVO : entry.getValue()) {
                 OemStandardProcessEntity oemStandardProcessEntity = getStandardProcessCode(standardProcessList, statementVO);
                 if (oemStandardProcessEntity != null) {