oyq28 пре 1 месец
родитељ
комит
95c729a7b8

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

@@ -305,7 +305,7 @@ public class OrderTaskServiceImpl extends SuperServiceImpl<OrderTaskMapper, Orde
                 taskNode.setTargetResourceId(endResourceId);
             }
             if(taskNode.getInterfaceType().equals("04") && taskNode.getResourceId()==null){
-                taskNode.setResourceId(endResourceId);
+                taskNode.setResourceId(endResourceId).setTargetResourceId(null);
             }
             taskNodes.add(taskNode);
         });

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

@@ -3394,15 +3394,13 @@ planId));
                     // 放,判断后一个动作节点是否是agv搬运,如果是,这个targetResourceId设置成空
                     if ("2".equals(command)) {
                         // 最后一个节点
-                        /*
                         if (count == childResourceAutoCodeList.size() - 1) {
                             taskNode.setTargetResourceId(t.getResourceId());
                         } else {
                             if (null == nextAutoCode.getResourceId()) {
                                 taskNode.setTargetResourceId(null);
                             }
-                        } */
-                        taskNode.setTargetResourceId(null);
+                        }
                     }
 
                     if (null != autoCode.getResourceId()) {