Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

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

@@ -79,13 +79,12 @@
         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
+            SELECT t.item_name, m.WO_ID
             FROM QA_WORK_PLAN_ITEM t
             LEFT JOIN MES_WORK_PLAN m ON t.WP_ID = m.ID
             WHERE t.id = #{wpiId}
         ) cond
         ON a.item_name = cond.item_name
-        AND a.COATING_TYPE = cond.COATING_TYPE
         AND b.WO_ID = cond.WO_ID
         WHERE a.is_deleted = 0 AND a.SOURCE_TYPE = 1
     </select>