fix：优化组套关系

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

@@ -498,11 +498,10 @@ public class TaskWorkNode {
                                         params.put("goal", "CT_"+ cncProductionresourcePosition.getPointId());
                                         params.put("cutGoalNo", cutToolShelfDevice.getData().get(0));
 
+                                        //添加刀具取任务
+                                        msgUtil.httpForPost(addCutToolTaskUrl, params.toJSONString());
                                     }
 
-                                    //添加刀具取任务
-                                    msgUtil.httpForPost(addCutToolTaskUrl, params.toJSONString());
-
                                 }
 
                                 //天轨刀具申请校验更新任务状态

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

@@ -146,7 +146,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\":\"FDJ\",\"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\":\"\",\"isMainShaft\":\"0\"}]}\n";
                 }
 
                 JSONObject resultObj = JSONObject.parseObject(resultData);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/CutterCategoriesService.java

@@ -7,6 +7,8 @@ import com.github.zuihou.business.cuttercategories.dto.CutterCategoriesDto;
 import com.github.zuihou.business.cuttercategories.entity.CutterCategories;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
+import java.util.List;
+
 
 public interface CutterCategoriesService extends SuperService<CutterCategories> {
 
@@ -16,6 +18,8 @@ public interface CutterCategoriesService extends SuperService<CutterCategories>
 
     R save(CutterCategoriesDto cutterCategoriesDto);
 
+    R deleteMore(List<Long> ids);
+
     R update(CutterCategoriesDto cutterCategoriesDto);
 
 }

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

@@ -82,6 +82,14 @@ public class CutterCategoriesServiceImpl extends SuperServiceImpl<CutterCategori
         return R.success();
     }
 
+    @Override
+    public R deleteMore(List<Long> ids) {
+
+        baseMapper.deleteBatchIds(ids);
+
+        return R.success();
+    }
+
     @Override
     public R update(CutterCategoriesDto cutterCategoriesDto) {
         return null;

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/ProductionresourceBizMapper.xml

@@ -123,7 +123,7 @@
     </select>
 
     <select id="getMachineInfo" resultType="com.github.zuihou.business.productionResourceCenter.entity.Productionresource">
-        SELECT
+        SELECT DISTINCT
             p.*,bp.submitted_file_name as programName
         FROM
             imcs_tenant_productionresource p

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

@@ -22,12 +22,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.cxf.common.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 @Slf4j
 @Validated
 @RestController
@@ -71,9 +70,11 @@ public class CutterCategoriesController extends SuperSimpleController<CutterCate
         IPage<CutterCategories> page = params.buildPage();
         LbqWrapper<CutterCategories> lbqWrapper = new LbqWrapper<CutterCategories>();
         CutterCategories model = params.getModel();
-        lbqWrapper.eq(CutterCategories::getPartsNo, model.getPartsNo())
+        lbqWrapper.eq(CutterCategories::getCutterT, model.getCutterT())
+                .eq(CutterCategories::getPartsNo, model.getPartsNo())
                 .eq(CutterCategories::getProcedureNo, model.getProcedureNo())
                 .eq(CutterCategories::getCutterName, model.getCutterName())
+                .eq(CutterCategories::getCutterNo, model.getCutterName())
                 .eq(CutterCategories::getProgramName, model.getProgramName())
                 .eq(CutterCategories::getBomName, model.getBomName())
                 .eq(CutterCategories::getCuttingToolType, model.getCuttingToolType());
@@ -84,11 +85,18 @@ public class CutterCategoriesController extends SuperSimpleController<CutterCate
         return this.success(page);
     }
 
-    @ApiOperation(value = "新增版本信息", notes = "新增版本信息")
+    @ApiOperation(value = "新增", notes = "新增息")
     @PostMapping("/save")
     public R<CutterCategories> save(@RequestBody CutterCategoriesDto model) {
         R save = cutterCategoriesService.save(model);
         return save;
     }
 
+    @ApiOperation(value = "删除", notes = "删除")
+    @PostMapping("/deleteMore")
+    public R<CutterCategories> deleteMore(@RequestBody CutterCategoriesDto model) {
+        R save = cutterCategoriesService.deleteMore(model.getIds());
+        return save;
+    }
+
 }

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

@@ -142,7 +142,7 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
     private BBomService bBomService;
 
     //刀具定时任务处理
-//    @Scheduled(cron = "0 0/2 * * * *")
+    @Scheduled(cron = "0 0/2 * * * *")
     @ApiOperation(value = "同步刀具", notes = "同步刀具")
     @PostMapping("/synchronousTool")
     public R<Boolean> synchronousTool() throws Exception {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/cuttercategories/dto/CutterCategoriesDto.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
+import java.util.List;
 
 import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 
@@ -26,6 +27,7 @@ import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 @NoArgsConstructor
 @Builder
 public class CutterCategoriesDto implements Serializable {
+    private List<Long> ids;
 
     private Long id;