fix：齐套性检测优化

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

@@ -114,6 +114,7 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
             applyChangeToolDetailDto.setCentralToolTypeList(vo.getList());
             applyChangeToolDetailDtoList.add(applyChangeToolDetailDto);
             */
+            // 给刀具分配的刀加号
             String cutGoalNo = this.getCutGoalNo(vo.getId().toString());
             if(null == cutGoalNo){
                 msgUtil.createWarnLog("机床刀具目标位为空","DataException");

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

@@ -60,8 +60,7 @@ public class CuttingToolServiceImpl extends SuperCacheServiceImpl<CuttingToolMap
 
     @Override
     public boolean check(CuttingToolSaveDTO data) {
-        if(super.count(Wraps.<CuttingTool>lbQ().eq(CuttingTool::getCuttingToolName,data.getCuttingToolName()))>0
-                || super.count(Wraps.<CuttingTool>lbQ().eq(CuttingTool::getCuttingToolNo,data.getCuttingToolNo())) >0 ){
+        if(super.count(Wraps.<CuttingTool>lbQ().eq(CuttingTool::getCuttingToolNo,data.getCuttingToolNo())) >0 ){
             return true;
         }
 

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

@@ -130,7 +130,7 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
                 ResponseEntity<String> postForEntity = restTemplate.postForEntity(instructionUrl, request, String.class);
                 synMachineCuttingTolls = postForEntity.getBody();
             }else {
-                synMachineCuttingTolls = "[{\"position\":\"1.1\",\"number\":\"1\",\"name\":\"XD-D32R2\",\"warnLife\":\"87\",\"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\":\"HD\"},{\"position\":\"1.2\",\"number\":\"2\",\"name\":\"XD20L68R40-ER32L100\",\"warnLife\":\"0\",\"targetLife\":\"8021.45\",\"workPiece\":null,\"workPieceWarn\":null,\"workPieceTarget\":null,\"wear\":null,\"wearWarn\":null,\"wearTarget\":null,\"sisterNo\":null,\"toolEdgeNo\":null,\"toolPosition\":null,\"toolRadius\":null,\"tl\":\"0\",\"doc\":\"\"}]\n";
+                synMachineCuttingTolls = "[{\"position\":\"1.4\",\"number\":\"22\",\"name\":\"1-LC190202-C5CFOL3507002L-C5L90\",\"warnLife\":\"87\",\"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\":\"HD\"},{\"position\":\"1.1\",\"number\":\"7\",\"name\":\"XD6\",\"warnLife\":\"87\",\"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\":\"HD\"},{\"position\":\"1.2\",\"number\":\"3\",\"name\":\"8C-N123E2-C5CFMR35070\",\"warnLife\":\"0\",\"targetLife\":\"8021.45\",\"workPiece\":null,\"workPieceWarn\":null,\"workPieceTarget\":null,\"wear\":null,\"wearWarn\":null,\"wearTarget\":null,\"sisterNo\":null,\"toolEdgeNo\":null,\"toolPosition\":null,\"toolRadius\":null,\"tl\":\"0\",\"doc\":\"\"}]\n";
             }
 
             log.info("设备" + productionresource.getName() + "同步刀具返回{}，请求参数{}",synMachineCuttingTolls,jsonObject.toString());
@@ -194,8 +194,14 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
             }
 
             // 判断collect是否还有数据，如果有进行删除，说明机床已经没有这些数据
-            ArrayList<String> needDel = new ArrayList<>(collect.keySet());
-            baseMapper.deleteBatchIds(needDel);
+            if(!collect.isEmpty()){
+                List<Long> collect1 = collect.values()
+                        .stream()
+                        .flatMap(Collection::stream)
+                        .map(MachineCuttingTool::getId)
+                        .collect(Collectors.toList());
+                baseMapper.deleteBatchIds(collect1);
+            }
 
         }
         dataList = new ArrayList<MachineCuttingTool>(map.values());

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

@@ -81,7 +81,8 @@ public class CuttingToolController extends SuperCacheController<CuttingToolServi
             wrapper.or().in(CuttingTool::getCuttingToolNo, cuttingToolPage.getNeedCutterList());
         }
 
-        wrapper.orderByAsc(CuttingTool::getCuttingToolName)
+        wrapper.orderByAsc(CuttingTool::getCuttingToolNo)
+                .orderByAsc(CuttingTool::getCuttingToolName)
                 .orderByDesc(CuttingTool::getCreateTime);
         baseService.findPage(page, wrapper);
     }