fix：优化组套刀具信息

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

@@ -591,6 +591,13 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
 
         // 查出之前生产中的计划和未完成的工序任务加入该调度任务一起排产
         List<Plan> productionPlans = planMapper.selectList(Wraps.<Plan>lbQ().in(Plan::getPlanStatus, "2"));
+        List<Order> cutToolOrder = baseMapper.selectList(Wraps.<Order>lbQ().like(Order::getOrderName, "cutToolOrder"));
+        if(cutToolOrder!=null && cutToolOrder.size()>0){
+            List<Long> collect = cutToolOrder.stream().map(Order::getId).collect(toList());
+            productionPlans = productionPlans.stream().filter(plan -> !collect.contains(plan.getOrderId())).collect(Collectors.toList());
+        }
+
+
         List<PlanProduct> productionPlanProducts = new ArrayList<>();
         List<OrderProduct> productionOrderProducts = new ArrayList<>();
         //查出所有产品ID

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

@@ -52,6 +52,7 @@ import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.exception.BizException;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -1776,7 +1777,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         List<Tray> trayList = trayService.list(new LbqWrapper<Tray>().eq(Tray::getCategoryType, tray.getCategoryType()).eq(Tray::getProductionType, tray.getProductionType()).eq(Tray::getFiveAxis, tray.getFiveAxis()).in(Tray::getId, stockIds));
 
         if(trayList.isEmpty() || trayList.size()==0){
-            throw new RuntimeException("库存没有可用的子盘");
+            throw new BizException("库存没有可用的子盘");
         }
         return trayList;
     }

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

@@ -63,6 +63,8 @@ public class CutterCategoriesServiceImpl extends SuperServiceImpl<CutterCategori
             }
         }
 
+        cutterSort = cutterSort==0?1:cutterSort;
+
         BBom bBom = bBomService.getOne(Wraps.<BBom>lbQ().eq(BBom::getPartsNo, cutterCategoriesDto.getPartsNo()));
 
         CuttingTool cuttingTool = cuttingToolService.getOne(Wraps.<CuttingTool>lbQ().eq(CuttingTool::getCuttingToolNo, cutterCategoriesDto.getCutterT()));

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

@@ -319,7 +319,7 @@ public class ProductionresourcePositionServiceImpl extends SuperServiceImpl<Prod
     public List<ProductionresourcePosition> getFreeCutterPositionByNos(String[] noArr) {
         // 只需要判断刀库同一位置不能有两个任务，其他可以
         boolean releasePoint = false;
-        if(!ArrayUtils.contains(noArr, DictionaryKey.YJ_ZONE_XBK.get("涡轴柔性加工单元-tool").split(",") )){
+        if(!ArrayUtils.contains(noArr, DictionaryKey.YJ_ZONE_XBK.get("涡轴柔性加工单元-tool"))){
             releasePoint = true;
         }
 
@@ -343,7 +343,7 @@ public class ProductionresourcePositionServiceImpl extends SuperServiceImpl<Prod
 
             for (String s : goalList) {
                 List<ProductionresourcePosition> list1 = collect1.get(s.replace("CT_", ""));
-                if(!list1.isEmpty() && list1.size()>0 ){
+                if(collect1.containsKey(s.replace("CT_", "")) && list1.size()>0 ){
                     collect1.remove(s.replace("CT_", ""));
                 }
             }

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

@@ -157,7 +157,7 @@ public class CacheRobotStrategy implements RobotStrategy {
 
         if (ObjectUtil.isEmpty(targetStorge)) {
             dataMap.put("result", false);
-            dataMap.put("resultMsg", returnMap.containsKey("resultMsg")?returnMap.get("resultMsg"):"目标点位不满足or线边库不符合要求存放");
+            dataMap.put("resultMsg", returnMap.containsKey("resultMsg")?returnMap.get("resultMsg"):"目标点位不满足or线边库不符合要求存放1");
             return dataMap;
         }
         String targetXbk = !returnMap.containsKey("targetxbk") ? null : returnMap.get("targetxbk").toString();

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

@@ -39,6 +39,8 @@ import com.github.zuihou.tenant.service.CodeRuleService;
 import com.github.zuihou.tenant.service.ProductionresourceService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -55,6 +57,8 @@ import java.util.zip.ZipException;
 @Slf4j
 public class ToolRobotStrategy implements RobotStrategy {
 
+    private static Logger logger = LoggerFactory.getLogger(ToolRobotStrategy.class);
+
     @Autowired
     private ZZoneProductionresourceMapper zZoneProductionresourceMapper;
 
@@ -215,7 +219,7 @@ public class ToolRobotStrategy implements RobotStrategy {
 
         if (ObjectUtil.isEmpty(targetStorge)) {
             dataMap.put("result", false);
-            dataMap.put("resultMsg", returnMap.containsKey("resultMsg")?returnMap.get("resultMsg") : "目标点位不满足or线边库不符合要求存放");
+            dataMap.put("resultMsg", returnMap.containsKey("resultMsg")?returnMap.get("resultMsg") : "目标点位不满足or线边库不符合要求存放or目标id是否为空2");
             return dataMap;
         }
         String targetXbk = !returnMap.containsKey("targetxbk") ? null : returnMap.get("targetxbk").toString();
@@ -344,6 +348,8 @@ public class ToolRobotStrategy implements RobotStrategy {
                     if (ObjectUtil.isEmpty(cutToolAction)) {
                         this.CNCTActionHandle(taskNode, true, pointId, orderTask);
                         msgUtil.redis_set(DemoLineConstant.DEMOLINE_CUT_DEVICE_ACTION, taskNode.getId().toString());
+                        returnMap.put("resultMsg","已下发机床取放刀标识");
+                        logger.warn("已下发机床取放刀标识");
                         return null;
                     }else if(!cutToolAction.toString().equals(taskNode.getId().toString())){
                         // 判断是否为同一个任务
@@ -359,6 +365,7 @@ public class ToolRobotStrategy implements RobotStrategy {
                 }else {
                     resultData = "{\"taskID\":\"1930201875534053376\",\"taskNodeID\":\"1930201875861659650\",\"result\":\"true\",\"resultMsg\":\"已被下料请求占用，等待下料任务完成\",\"concurrency\":\"false\",\"data\":null,\"returnData\":null}\n";
                 }
+                logger.warn("调用getCutterDeviceIsPut反馈结果："+ resultData);
 
                 JSONObject resultObj = JSONObject.parseObject(resultData);
                 resultMsg = resultObj.getString("resultMsg");
@@ -375,6 +382,8 @@ public class ToolRobotStrategy implements RobotStrategy {
                     returnMap.put("store", targetStorge);
                     returnMap.put("targetxbk", "0");
                 }else{
+                    returnMap.put("resultMsg","targetList 集合为空");
+                    logger.warn("targetList 集合为空");
                     xbkFlag = "1";
                 }
             }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/util/MsgUtil.java

@@ -734,6 +734,9 @@ public class MsgUtil implements ApplicationContextAware {
         catch(BizException ex){
             logger.error("接口{}数据远程调用失败", instructionUrl);
         }
+
+        logger.warn("调用CCS结果{}", returnData);
+
         return returnData;
     }