|
@@ -158,8 +158,11 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
|
|
|
//machineCuttingTool.setCuttingToolRadius(tool.getString("toolRadius"));
|
|
|
String tl = tool.getString("tl");
|
|
|
machineCuttingTool.setTl(tl);
|
|
|
+ String doc = tool.getString("doc");
|
|
|
+ machineCuttingTool.setDoc(doc);
|
|
|
baseMapper.insert(machineCuttingTool);
|
|
|
- if(map.containsKey(resourceId) && tl.equals("L")){
|
|
|
+ //刀具报警 调用天轨 目标去刀具上下料站
|
|
|
+ if(map.containsKey(resourceId) && (tl.equals("L") || doc.equals("HD"))){
|
|
|
map.put(resourceId, machineCuttingTool);
|
|
|
}
|
|
|
}
|