fix:刀具换到逻辑

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

@@ -170,7 +170,7 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
                 machineCuttingTool.setDoc(doc);
                 baseMapper.insert(machineCuttingTool);
                 //刀具报警 调用天轨 目标去刀具上下料站
-                if(map.containsKey(resourceId) && (tl.equals("L") || doc.equals("HD"))){
+                if(!map.containsKey(resourceId) && (tl.equals("L") || doc.equals("HD"))){
                     map.put(resourceId, machineCuttingTool);
                 }
             }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/ToolController.java

@@ -145,15 +145,16 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
                     ProductionresourcePosition cutToolStation = cutToolStationList.get(i);
                     Productionresource productionresource = productionresourceBizService.getById(cutToolStation.getResourceId());
                     data.put("goalType", productionresource.getCode());
-                    data.put("goal", cutToolStation.getPointId());
+                    data.put("goal", "CT_" + cutToolStation.getPointId());
                 } else {
                     //非报警移动到线边库释放刀具
                     data.put("goalType", DictionaryKey.YJ_ZONE_XBK.get(zoneName + "-tool"));
-                    data.put("goal", xbkList.get(i).getPointId());
+                    data.put("goal", "CT_" + xbkList.get(i).getPointId());
                 }
 
                 String cutPosition = item.getCuttingToolPosition().replace("1.", "");
                 data.put("cutStartNo", cutPosition);
+                data.put("cutGoalNo", "0");
                 toolbarController.addCutToolTask(data);
                 item.setStatus("1");
                 machineCuttingToolService.updateAllById(item);