fix：修改刀具入库刀加号等信息，避免重复性问题

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -441,6 +441,8 @@ public class TaskWorkNode {
                                     List<Long> cuttingToolIdList = cuttingToolService.list(new LbqWrapper<CuttingTool>().eq(CuttingTool::getCuttingToolNo, confBatchNo).or().eq(CuttingTool::getCuttingToolName, confBatchNo)).stream().map(CuttingTool::getId).collect(Collectors.toList());
                                     if(cuttingToolIdList.size() == 0 ){
                                         log.setFeedback("指定待取刀具数据不存在");
+                                        //删除自定义订单内容
+                                        orderTaskService.removeById(orderTask.getId());
                                         return;
                                     }
                                     List<StockInfo> stockInfoList = stockInfoMapper.selectList(new LbqWrapper<StockInfo>().eq(StockInfo::getGoodsType, "6").in(StockInfo::getGoodsId, cuttingToolIdList));
@@ -453,6 +455,8 @@ public class TaskWorkNode {
 
                                     if(productionresourcePositionList.size() == 0){
                                         log.setFeedback("指定待取刀具库位信息不存在");
+                                        //删除自定义订单内容
+                                        orderTaskService.removeById(orderTask.getId());
                                         return;
                                     }
 

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

@@ -258,6 +258,7 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
     }
 
 
+    @Autowired
     private ProductionresourceBizService getProductionresourceBizService;
     @Override
     public R<List<String>> getCutToolShelfDevice(String code){
@@ -268,7 +269,7 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
         }
 
         if(!one.getName().contains("SMG80")){
-           return R.result(1000,null,"此设备不需要刀架号");
+           return R.success(null,"1000");
         }
 
         try {

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

@@ -144,7 +144,7 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
                     ResponseEntity<String> postForEntity = restTemplate.postForEntity(instructionUrl, request, String.class);
                     resultData = postForEntity.getBody();
                 } else {
-                    resultData = "{\"result\":\"true\",\"msg\":\"success\",\"code\":200,\"total\":0,\"data\":[{\"position\":\"1.1\",\"number\":\"1\",\"name\":\"XD20\",\"warnLife\":\"0\",\"targetLife\":\"2282.88\",\"workPiece\":null,\"workPieceWarn\":null,\"workPieceTarget\":null,\"wear\":null,\"wearWarn\":null,\"wearTarget\":null,\"sisterNo\":null,\"toolEdgeNo\":null,\"toolPosition\":null,\"toolRadius\":null,\"tl\":\"0\",\"doc\":\"\",\"isMainShaft\":\"0\"},{\"position\":\"1.5\",\"number\":\"5\",\"name\":\"7-N123F2-57032R-C5RG-C5L90\",\"warnLife\":\"0\",\"targetLife\":\"6.78\",\"workPiece\":null,\"workPieceWarn\":null,\"workPieceTarget\":null,\"wear\":null,\"wearWarn\":null,\"wearTarget\":null,\"sisterNo\":null,\"toolEdgeNo\":null,\"toolPosition\":null,\"toolRadius\":null,\"tl\":\"0\",\"doc\":\"\",\"isMainShaft\":\"0\"}]}\n";
+                    resultData = "{\"result\":\"true\",\"msg\":\"success\",\"code\":200,\"total\":0,\"data\":[{\"position\":\"1.1\",\"number\":\"1\",\"name\":\"XD20\",\"warnLife\":\"0\",\"targetLife\":\"2282.88\",\"workPiece\":null,\"workPieceWarn\":null,\"workPieceTarget\":null,\"wear\":null,\"wearWarn\":null,\"wearTarget\":null,\"sisterNo\":null,\"toolEdgeNo\":null,\"toolPosition\":null,\"toolRadius\":null,\"tl\":\"0\",\"doc\":\"\",\"isMainShaft\":\"0\"},{\"position\":\"1.5\",\"number\":\"5\",\"name\":\"7-N123F2-57032R-C5RG-C5L90\",\"warnLife\":\"0\",\"targetLife\":\"6.78\",\"workPiece\":null,\"workPieceWarn\":null,\"workPieceTarget\":null,\"wear\":null,\"wearWarn\":null,\"wearTarget\":null,\"sisterNo\":null,\"toolEdgeNo\":null,\"toolPosition\":null,\"toolRadius\":null,\"tl\":\"0\",\"doc\":\"HD\",\"isMainShaft\":\"0\"}]}\n";
                 }
 
                 JSONObject resultObj = JSONObject.parseObject(resultData);

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

@@ -4,35 +4,23 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.zuihou.authority.entity.common.Parameter;
+import com.github.zuihou.base.R;
+import com.github.zuihou.base.controller.SuperController;
 import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.edgeLibrary.dao.StorgeTrayConfMapper;
 import com.github.zuihou.business.edgeLibrary.entity.SStorgeTrayConf;
-import com.github.zuihou.business.edgeLibrary.entity.Shelves;
-import com.github.zuihou.business.edgeLibrary.entity.Storge;
-import com.github.zuihou.business.edgeLibrary.service.StorgeService;
-import com.github.zuihou.business.operationManagementCenter.entity.OrderTask;
-import com.github.zuihou.business.operationManagementCenter.service.OrderTaskService;
 import com.github.zuihou.business.operationManagementCenter.service.ToolTaskService;
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
 import com.github.zuihou.business.productionReadyCenter.service.CuttingToolService;
-import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
+import com.github.zuihou.business.productionResourceCenter.dto.ProductionresourcePositionPageDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.ProductionresourcePositionSaveDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.ProductionresourcePositionUpdateDTO;
-import com.github.zuihou.business.productionResourceCenter.dto.ProductionresourcePositionPageDTO;
+import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.github.zuihou.base.controller.SuperController;
-import com.github.zuihou.base.R;
 import com.github.zuihou.common.constant.DictionaryKey;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
-import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.exception.BizException;
 import com.github.zuihou.log.annotation.SysLog;
 import io.swagger.annotations.Api;
@@ -42,7 +30,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.github.zuihou.security.annotation.PreAuth;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 
 /**
@@ -74,15 +67,15 @@ public class ProductionresourcePositionController extends SuperController<Produc
         LbqWrapper<ProductionresourcePosition> wrapper = wrap.lambda();
         ProductionresourcePosition pp = BeanUtil.toBean(data, ProductionresourcePosition.class);
 
-        wrapper.eq(ProductionresourcePosition::getResourceId,pp.getResourceId())
+        wrapper.eq(ProductionresourcePosition::getResourceId, pp.getResourceId())
                 .orderByAsc(ProductionresourcePosition::getName).orderByAsc(ProductionresourcePosition::getPointId);
         baseService.pageList(page, wrapper);
     }
 
     @ApiOperation(value = "所有生产资源位置", notes = "所有查询生产资源位置")
     @PostMapping("/all")
-    public R<List<ProductionresourcePosition>> list(@ApiParam(name="货架对象",value="传入json格式",required = true)
-                                                        @RequestBody(required = false) ProductionresourcePosition bean) {
+    public R<List<ProductionresourcePosition>> list(@ApiParam(name = "货架对象", value = "传入json格式", required = true)
+                                                    @RequestBody(required = false) ProductionresourcePosition bean) {
         return success(baseService.list(Wraps.<ProductionresourcePosition>lbQ().eq(ProductionresourcePosition::getResourceId, bean.getResourceId())));
     }
 
@@ -109,7 +102,7 @@ public class ProductionresourcePositionController extends SuperController<Produc
 
     @ApiOperation(value = "关联库位", notes = "关联库位")
     @GetMapping("/getRelationLocationList")
-    public R<List<Map<String,Object>>> getRelationLocationList() {
+    public R<List<Map<String, Object>>> getRelationLocationList() {
         return success(baseService.getRelationLocationList());
     }
 
@@ -119,19 +112,19 @@ public class ProductionresourcePositionController extends SuperController<Produc
 
         JSONObject jsonObject = JSONObject.parseObject(json);
         List<ProductionresourcePosition> positionList = baseService.getFreeCutterPositionByNos(new String[]{jsonObject.getString("code")});
-        List<ProductionresourcePosition> dataList = positionList.stream().filter(item->(item.getName().contains("刀库位") || item.getName().contains("刀具"))).collect(Collectors.toList());
+        List<ProductionresourcePosition> dataList = positionList.stream().filter(item -> (item.getName().contains("刀库位") || item.getName().contains("刀具"))).collect(Collectors.toList());
 
         // 根据刀具号查询刀具id，查询，对刀放置的位置有没有限制 -start
-        if(jsonObject.containsKey("cutterNo") && !jsonObject.getString("cutterNo").isEmpty() && DictionaryKey.YJ_ZONE_XBK.get("涡轴柔性加工单元-tool").equalsIgnoreCase(jsonObject.getString("code"))){
+        if (jsonObject.containsKey("cutterNo") && !jsonObject.getString("cutterNo").isEmpty() && DictionaryKey.YJ_ZONE_XBK.get("涡轴柔性加工单元-tool").equalsIgnoreCase(jsonObject.getString("code"))) {
             CuttingTool cutterNo = cuttingToolService.getOne(Wraps.<CuttingTool>lbQ().eq(CuttingTool::getCuttingToolNo, Long.parseLong(jsonObject.getString("cutterNo"))));
-            if(Objects.isNull(cutterNo)){
+            if (Objects.isNull(cutterNo)) {
                 throw new BizException("无此刀具");
             }
 
             // 查询刀具限定的刀具位置
             List<SStorgeTrayConf> sStorgeTrayConfs = storgeTrayConfMapper.selectList(Wraps.<SStorgeTrayConf>lbQ().eq(SStorgeTrayConf::getProductId, cutterNo.getId()).eq(SStorgeTrayConf::getSelectType, 2));
 
-            if(!sStorgeTrayConfs.isEmpty()){ // 为空，没有配置刀具限定位置
+            if (!sStorgeTrayConfs.isEmpty()) { // 为空，没有配置刀具限定位置
 
                 List<Long> collect = sStorgeTrayConfs.stream().map(SStorgeTrayConf::getStorgeId).collect(Collectors.toList());
                 Map<Long, List<ProductionresourcePosition>> collect1 = dataList.stream().collect(Collectors.groupingBy(ProductionresourcePosition::getStorgeId));
@@ -139,7 +132,7 @@ public class ProductionresourcePositionController extends SuperController<Produc
                 dataList = new ArrayList<>();
                 for (Long s : collect) {
                     List<ProductionresourcePosition> list1 = collect1.get(s);
-                    if(list1!=null && !list1.isEmpty()){
+                    if (list1 != null && !list1.isEmpty()) {
                         dataList.add(list1.get(0));
                     }
                 }
@@ -153,7 +146,7 @@ public class ProductionresourcePositionController extends SuperController<Produc
     @ApiOperation(value = "获取刀具设备点位", notes = "获取刀具设备点位")
     @PostMapping("/getCutToolDevice")
     public R<ProductionresourcePosition> getCutToolDevice(@RequestParam String pointId) {
-        ProductionresourcePosition position = baseService.getOne(new LambdaQueryWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getStatus,"0").eq(ProductionresourcePosition::getPointId, pointId).last("LIMIT 1"));
+        ProductionresourcePosition position = baseService.getOne(new LambdaQueryWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getStatus, "0").eq(ProductionresourcePosition::getPointId, pointId).last("LIMIT 1"));
         return success(position);
     }
 

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

@@ -270,7 +270,7 @@ public class BBom extends Entity<Long> {
     private String drawingNo;
 
     @ApiModelProperty(value = "类型分类")
-    @TableField("class_type")
+    @TableField(exist = false)
     @Excel(name = "类型分类")
     private String classType;