Explorar o código

根据汉中项目流程修改

wudingsheng hai 3 meses
pai
achega
af3433f1dc

+ 16 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/DemoLine/DemoLineConstant.java

@@ -336,6 +336,22 @@ public interface DemoLineConstant {
         }
     };
 
+    Map<String, String> ZONE_ROBOT_CK = new HashMap<String, String>(){
+        {
+            // 云箭配置
+//            put("1", "FMS_机器人");
+//            put("2", "保障中心_伺服舵机");
+//            put("3", "框体_机器人");
+            // 331
+            put("capsule", "上下料站-工装出库");
+            put("DY_202513520024", "车削上下料站-工装出库");
+            // 示范线配置
+//            put("1", "柔性线_机器人_手抓");
+//            put("2", "质量中心_机器人");
+//            put("3", "框体_机器人");
+        }
+    };
+
 
     String DEMOLINE_STOCK_CK_CODE2 = "上下料站-工装出库2";
 

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

@@ -3321,7 +3321,7 @@ planId));
         //重建最初获取工装节点
         //List<TaskNode> switchNodes = this.list(new LbqWrapper<TaskNode>().lt(TaskNode::getCompleteBatchSort,
         //        taskNode.getCompleteBatchSort()).eq(TaskNode::getCompleteBatchNo, taskNode.getCompleteBatchNo()).orderByAsc(TaskNode::getCompleteBatchSort).last("limit 3"));
-        ResourceBusiness resourceBusiness2 = resourceBusinessMapper.selectOne(new LbqWrapper<ResourceBusiness>().eq(ResourceBusiness::getName, DemoLineConstant.DEMOLINE_STOCK_CK_CODE));
+        ResourceBusiness resourceBusiness2 = resourceBusinessMapper.selectOne(new LbqWrapper<ResourceBusiness>().eq(ResourceBusiness::getName, DemoLineConstant.ZONE_ROBOT_CK.get(zoneNo)));
         List<TaskNode> switchNodes = this.getCreateTaskNode(resourceBusiness2.getId(), tTask);
         switchNodes.stream().forEach(node -> {
             TaskNode headNode = new TaskNode();