刀具取放功能处理

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

@@ -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);
                 }
             }

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

@@ -130,7 +130,7 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
             for(int i=0;i<cutToolList.size(); i++) {
                 MachineCuttingTool item = cutToolList.get(i);
                 //默认取刀具去刀架
-                boolean isWarn = false;
+                boolean isWarn = item.getTl().equals("L")? true : false;
                 //同步添加天轨处理订单
                 Map<String, String> data = Maps.newHashMap();
                 //获取机床待取库位

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MachineCuttingToolPageDTO.java

@@ -155,4 +155,10 @@ public class MachineCuttingToolPageDTO implements Serializable {
     @ApiModelProperty(value = "锁定运行状态")
     private String status;
 
+    /**
+     * 锁定运行状态
+     */
+    @ApiModelProperty(value = "换刀标识位")
+    private String doc;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MachineCuttingToolSaveDTO.java

@@ -147,4 +147,10 @@ public class MachineCuttingToolSaveDTO implements Serializable {
      */
     @ApiModelProperty(value = "锁定运行状态")
     private String status;
+
+    /**
+     * 锁定运行状态
+     */
+    @ApiModelProperty(value = "换刀标识位")
+    private String doc;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MachineCuttingTool.java

@@ -200,6 +200,14 @@ public class MachineCuttingTool extends Entity<Long> {
     @Excel(name = "锁定运行状态")
     private String status;
 
+    /**
+     * 锁定运行状态
+     */
+    @ApiModelProperty(value = "换刀标识位(''-不需换刀 HD-需要换刀)")
+    @TableField(value = "doc", condition = EQUAL)
+    @Excel(name = "换刀标识位")
+    private String doc;
+
     @TableField(exist = false)
     private List<Long> ids;
 }