fix:优化节点逻辑

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

@@ -438,7 +438,7 @@ public class TaskWorkNode {
                                     String confBatchNo = orderTask.getConfBatchNo();
                                     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 ){
-                                        msgUtil.createWarnLog("指定待取刀具数据不存在", "DataException");
+                                        autoNodeLog.setFeedback("指定待取刀具数据不存在");
                                         return;
                                     }
                                     List<StockInfo> stockInfoList = stockInfoMapper.selectList(new LbqWrapper<StockInfo>().eq(StockInfo::getGoodsType, "6").in(StockInfo::getGoodsId, cuttingToolIdList));
@@ -450,7 +450,7 @@ public class TaskWorkNode {
                                     }).collect(Collectors.toList());
 
                                     if(productionresourcePositionList.size() == 0){
-                                        msgUtil.createWarnLog("指定待取刀具库位信息不存在", "DataException");
+                                        autoNodeLog.setFeedback("指定待取刀具库位信息不存在");
                                         return;
                                     }
 

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

@@ -339,8 +339,9 @@ public class ToolRobotStrategy implements RobotStrategy {
                     bool = resultObj.getBoolean("result");
                 }
                 if (!bool) {
-                    msgUtil.createWarnLog("刀具节点目标位放置条件不满足", "DataException");
-                    return null;
+                    returnMap.put("result", false);
+                    returnMap.put("resultMsg","刀具节点目标位放置条件不满足");
+                    return returnMap;
                 }
                 if (CollectionUtil.isNotEmpty(targetList)) {
                     returnMap.put("storeResourceId", targetResourceId);

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/cutterdata/entity/CutterTestDataEntity.java

@@ -50,25 +50,25 @@ public class CutterTestDataEntity extends Entity<Long> {
     @Length(max = 128, message = "名称长度不能超过128")
     @TableField(value = "cutter_name", condition = LIKE)
     @Excel(name = "刀具名")
-    private  String cutterName;
+    private  String cutterName ="";
 
     @ApiModelProperty(value = "刀具类型(对刀仪)")
     @Length(max = 128, message = "名称长度不能超过128")
     @TableField(value = "cutter_typ", condition = LIKE)
     @Excel(name = "刀具类型")
-    private  String cutterTyp;
+    private  String cutterTyp ="0";
 
     @ApiModelProperty(value = "刀具类型(机床)")
     @Length(max = 128, message = "名称长度不能超过128")
     @TableField(value = "cutter_typ_dnc", condition = LIKE)
     @Excel(name = "刀具类型(机床)")
-    private  String cutterTypDnc;
+    private  String cutterTypDnc ="0";
 
     @ApiModelProperty(value = "刀具子类型(机床)")
     @Length(max = 128, message = "名称长度不能超过128")
     @TableField(value = "cutter_typ_sub_dnc", condition = LIKE)
     @Excel(name = "刀具子类型(机床)")
-    private  String cutterTypSubDnc;
+    private  String cutterTypSubDnc ="0";
 
     @ApiModelProperty(value = "刀具长度-对应机床L或者车刀表zl代表刀具在z轴方向上的长度")
     @Length(max = 128, message = "名称长度不能超过128")