fix：齐套性检测优化

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

@@ -224,7 +224,7 @@ public class CutterTestDataServiceImpl extends SuperServiceImpl<CutterTestDataMa
         List<CutterTestDataEntity> list = this.list(queryWrapper);
 
         if (list.isEmpty()) {
-            throw new RuntimeException("没有查询到刀具信息，需要的刀柄号："+ cuttingToolNo);
+            throw new RuntimeException("没有查询到对刀信息，需要的刀柄号："+ cuttingToolNo);
         }
 
         CutterTestDataEntity cutterTestDataEntity = list.get(0);

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

@@ -426,8 +426,8 @@ public class TaskWorkNode {
                                 //地轨原订单恢复初始化
                                 //获取原订单零件批次号
                                 if(StringUtils.isNotEmpty(orderTask.getConfBatchNo()) && orderTask.getIsMachine().equals("1")){
-                                    String hostSystemUrl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(ParameterKey.ECSSYSTEMURL).toString());
-                                    String eraseWorkPieceUrl = hostSystemUrl + "/api/authority/toolbar/eraseWorkPiece";
+                                    String ecssystemurl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(ParameterKey.ECSSYSTEMURL).toString());
+                                    String eraseWorkPieceUrl = ecssystemurl + "/toolbar/eraseWorkPiece";
                                     JSONObject params = new JSONObject();
                                     params.put("completeBatchNo", orderTask.getConfBatchNo());
                                     msgUtil.httpForPost(eraseWorkPieceUrl, params.toJSONString());
@@ -458,8 +458,8 @@ public class TaskWorkNode {
                                     }
 
                                     ProductionresourcePosition productionresourcePosition = productionresourcePositionList.get(0);
-                                    String hostSystemUrl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(ParameterKey.ECSSYSTEMURL).toString());
-                                    String addCutToolTaskUrl = hostSystemUrl + "/api/authority/toolbar/addCutToolTask";
+                                    String ecssystemurl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(ParameterKey.ECSSYSTEMURL).toString());
+                                    String addCutToolTaskUrl = ecssystemurl + "/toolbar/addCutToolTask";
 
                                     //触发取刀架刀具放入机床
                                     //同步添加天轨处理订单

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.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";
+                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\":\"\"},{\"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\":\"\"},{\"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());

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/CuttingToolApplyMapper.xml

@@ -87,6 +87,7 @@
                 icta.resource_id,
                 icta.create_time,
                 icta.cut_goal_no,
+                icta.process_status_message,
                 (case icta.process_status when '0' then '未处理' when '1' then '缺料' when '2' then '处理中' when '3' then '已处理' end) AS processStatusName,
                 icc.parts_no,
                 icc.procedure_no,
@@ -97,7 +98,8 @@
                 itp.name AS resourceName,
                 itp.code AS goalType
 
-                FROM imcs_cutting_tool_apply icta
+
+            FROM imcs_cutting_tool_apply icta
                      LEFT JOIN imcs_cutter_categories icc on icta.cutting_tool_no = icc.cutter_t
                      LEFT JOIN imcs_cutting_tool ict on icta.cutting_tool_no = ict.cutting_tool_no
                      LEFT JOIN imcs_s_stock_info issi on ict.id = issi.goods_id and issi.goods_type='6'

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

@@ -129,7 +129,7 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
         return success(count > 0);
     }
 
-    @Scheduled(cron = "0 0/2 * * * *")
+    @Scheduled(cron = "0 0/1 * * * *")
     @ApiOperation(value = "自动换刀", notes = "自动换刀")
     @PostMapping("/cuttingToolTask")
     public R<Boolean> cuttingToolTask() {
@@ -146,8 +146,8 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
         dataList = new ArrayList<CuttingToolApply>(currentMap.values());
         if(dataList.size() == 0) return R.success();
 
-        String hostSystemUrl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(ParameterKey.ECSSYSTEMURL).toString());
-        String addCutToolTaskUrl = hostSystemUrl + "/api/authority/toolbar/addCutToolTask";
+        String ecsSystemUrl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(ParameterKey.ECSSYSTEMURL).toString());
+        String addCutToolTaskUrl = ecsSystemUrl + "/toolbar/addCutToolTask";
 
         dataList.stream().forEach(item->{
             if(StringUtils.isEmpty(item.getStart())){
@@ -167,11 +167,19 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
             //确定刀具申请校验
             params.put("isApply", item.getId());
 
-            //添加刀具取任务
-            msgUtil.httpForPost(addCutToolTaskUrl, params.toJSONString());
-
+            item.setProcessStatusMessage("已下发自动化任务");
             //更改申请状态
             item.setProcessStatus("2");
+
+            //添加刀具取任务
+            try {
+                msgUtil.httpForPost(addCutToolTaskUrl, params.toJSONString());
+            }catch (Exception e){
+                item.setProcessStatusMessage(e.getMessage());
+                //更改申请状态
+                item.setProcessStatus("0");
+            }
+
             baseService.updateById(item);
         });
         return R.success();

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

@@ -80,6 +80,10 @@ public class CuttingToolApply extends Entity<Long> {
     @TableField(value = "process_status", condition = LIKE)
     private String processStatus;
 
+    @ApiModelProperty(value = "处理信息")
+    @TableField(value = "process_status_message", condition = LIKE)
+    private String processStatusMessage;
+
     /**
      * 处理状态 0 未处理 1：缺料 2：已处理
      */