后台代码更新处理

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

@@ -365,7 +365,7 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                  }
 
                 break;
-            case "smg80":
+            case "smu50":
                 Productionresource productionresource1 =  productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId()));
                 map.put("url",productionresource1.getIp());
                 map.put("port",productionresource1.getPort());

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

@@ -359,14 +359,24 @@ public class CacheRobotStrategy implements RobotStrategy {
         Long targetStorgeResourceId = !returnMap.containsKey("storeResourceId") ? null : Long.valueOf(returnMap.get("storeResourceId").toString());
         String targetXbk = !returnMap.containsKey("targetxbk") ? null : returnMap.get("targetxbk").toString();
         String xbkCount = dataMap.containsKey(taskNode.getId()+"count")? dataMap.get(taskNode.getId()+"count").toString(): null;
+        //线边库移动判断暂存位是否有空余位置
+        if(targetXbk.equals("0") && robotList.size() == 1){
+            dataMap.put("result", false);
+            dataMap.put("resultMsg", "条件判断不通过，暂存位无空闲位置，节点名字"+ taskNode.getNodeName()+"节点id："+taskNode.getId());
+            return dataMap;
+        }
+
         //线边库目标位置被占用
         if (ObjectUtil.isNotEmpty(targetXbk) && targetXbk.equals("1") && StringUtils.isNotEmpty(xbkCount) && xbkCount.equals("1")) {
+            //暂存位条件不满足
             Object hcwXbkFlag = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_HCW_XBK_FLAG + taskNode.getId());
             if(ObjectUtil.isNotEmpty(hcwXbkFlag)){
                 dataMap.put("result", false);
                 dataMap.put("resultMsg", "条件判断不通过，目标位被占用，节点名字"+ taskNode.getNodeName()+"节点id："+taskNode.getId());
                 return dataMap;
             }
+            //线边库位置条件不满足
+
             //暂存位优先级低的节点目标位线边库模式，当暂存位上只有一块工装时将优先级低调整成优先级高
             Object jqrHcwPartPriotyExec = (null == msgUtil.redis_get(DemoLineConstant.JQR_HCW_PART_PRIOTY_EXEC_FLAG + taskNode.getId())) ? null : msgUtil.redis_get(DemoLineConstant.JQR_HCW_PART_PRIOTY_EXEC_FLAG + taskNode.getId());
             if(ObjectUtil.isNotEmpty(jqrHcwPartPriotyExec) && robotList.size() == 2 && jqrList.size() == 1){