刀具校验防止设备刀具一把刀都没有改成左关联

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/PlanServiceImpl.java

@@ -400,7 +400,7 @@ public class PlanServiceImpl extends SuperServiceImpl<PlanMapper, Plan> implemen
         for(Map<String,String> data : checkPlanCuttingTools){
             data.put("hasCuttingToolsFlag","是");
             String cuttingTools = data.get("needCuttingTools");
-            String hasCuttingTools = data.get("hasCuttingTools");
+            String hasCuttingTools = StringUtils.isBlank(data.get("hasCuttingTools"))?"":data.get("hasCuttingTools");
             List<String> ori = Arrays.asList(cuttingTools.split(","));
             List<String> compare = Arrays.asList(hasCuttingTools.split(","));
             for(String cuttingName : ori){

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/PlanMapper.xml

@@ -193,18 +193,18 @@
                 GROUP_CONCAT(ibbpt.tool_name) AS needCuttingTools
                 FROM imcs_b_bom_procedure_tool ibbpt
                 GROUP BY ibbpt.procedure_id,
-                ibbpt.resource_id) produceCuttingTools,
+                ibbpt.resource_id) produceCuttingTools left join
             (SELECT
                 icc.machine_id AS resourceId,
                 GROUP_CONCAT(icc.cutting_tool_name) AS hasCuttingTools
             FROM imcs_collect_cutting icc
-            GROUP BY icc.machine_id) resourceCuttingTools
+            GROUP BY icc.machine_id) resourceCuttingTools ON produceCuttingTools.resourceId = resourceCuttingTools.resourceId
         WHERE ippp.bom_id = ibb.id
         AND ibb.id = ibbvi.bom_id
         AND ibbvi.use_status = '1'
         AND ibbp.bom_id = ibbvi.bom_id
         AND ibbp.id = produceCuttingTools.procedureId
-        AND produceCuttingTools.resourceId = resourceCuttingTools.resourceId
+
         <if test="planId != null and planId != ''">
             and ippp.plan_id in (${planId})
         </if>