刀具功能改进

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/CuttingToolMapper.java

@@ -34,4 +34,5 @@ public interface CuttingToolMapper extends SuperMapper<CuttingTool> {
     List<String> getToolCategory(@Param("list") List<Long> cuttingToolId);
 
     CuttingTool getToolId(String code);
+
 }

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

@@ -62,4 +62,6 @@ public interface CuttingToolService extends SuperCacheService<CuttingTool> {
     List<CuttingTool> pageList();
 
     List<CuttingToolResource> getResource(CuttingToolResourcePageQuery model);
+
+    CuttingTool queryOneCuttingTool(Map<String, String > map);
 }

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

@@ -148,4 +148,14 @@ public class CuttingToolServiceImpl extends SuperCacheServiceImpl<CuttingToolMap
     public List<CuttingToolResource> getResource(CuttingToolResourcePageQuery model) {
         return cuttingToolResourceService.list(new QueryWrap<CuttingToolResource>().lambda().eq(CuttingToolResource::getToolId,model.getToolId()));
     }
+
+    @Override
+    public CuttingTool queryOneCuttingTool(Map<String, String> map) {
+        List<CuttingTool> cuttingToolList = baseMapper.selectList(new LbqWrapper<CuttingTool>().eq(CuttingTool::getSpecifications, map.get("specifications")));
+        if(cuttingToolList.size()>0){
+            return cuttingToolList.get(0);
+        }else{
+            return null;
+        }
+    }
 }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/CuttingToolController.java

@@ -30,6 +30,7 @@ import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.model.RemoteData;
+import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -112,4 +113,13 @@ public class CuttingToolController extends SuperCacheController<CuttingToolServi
         return success(resourceIdList);
     }
 
+    @ApiOperation(value = "查询同规格刀具", notes = "查询同规格刀具")
+    @PostMapping("/queryOneCuttingTool")
+    public R<CuttingTool> queryOneCuttingTool(String specifications) {
+        Map map = Maps.newHashMap();
+        map.put("specifications", specifications);
+        CuttingTool cuttingTool = baseService.queryOneCuttingTool(map);
+        return success(cuttingTool);
+    }
+
 }

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

@@ -70,9 +70,6 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
     @Autowired
     private ProductionresourcePositionService productionresourcePositionService;
 
-    @Autowired
-    private StorgeService storgeService;
-
     @Autowired
     private MsgUtil msgUtil;
 
@@ -140,12 +137,14 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
                 ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getResourceId, item.getMachineId()).like(ProductionresourcePosition::getPointId, "CNC0").last("LIMIT 1"));
                 data.put("start", "CT_" + productionresourcePosition.getPointId());
                 if (isWarn) {
+                    //报警直接上下料站下料
                     List<ProductionresourcePosition> cutToolStationList = productionresourcePositionService.list(new LbqWrapper<ProductionresourcePosition>().like(ProductionresourcePosition::getPointId, "LAUPT"));
                     ProductionresourcePosition cutToolStation = cutToolStationList.get(i);
                     Productionresource productionresource = productionresourceBizService.getById(cutToolStation.getResourceId());
                     data.put("goalType", productionresource.getCode());
                     data.put("goal", cutToolStation.getPointId());
                 } else {
+                    //非报警移动到线边库释放刀具
                     data.put("goalType", DictionaryKey.YJ_ZONE_XBK.get(zoneName + "-tool"));
                     data.put("goal", xbkList.get(i).getPointId());
                 }