同步修改抽检工序的工序ID问题

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

@@ -120,11 +120,11 @@ public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, In
         return productionresource.getId();
     }
 
-    private List<TaskNode> addSupportNodes(List<TaskNode> supportNodes, boolean isHeader, Long taskId, List<TaskNode> taskNodeList,TaskNode lastNode, String zoneName){
+    private List<TaskNode> addSupportNodes(List<TaskNode> supportNodes, boolean isHeader, TTask task, List<TaskNode> taskNodeList,TaskNode lastNode, String zoneName){
         List<TaskNode> dataList = dozer.mapList(supportNodes, TaskNode.class);
 
         dataList.forEach(item->{
-            item.setTaskId(taskId).setTaskNodeNo(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TASK_NODE))
+            item.setTaskId(task.getId()).setTaskNodeNo(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TASK_NODE)).setProcedureId(task.getProcedureId())
                     .setExeStatus("1").setPrority(lastNode.getPrority()+1+taskNodeList.size());
             //替换设备为伺服舵机
             Long resourceId = getResourceIdByAutoCode("2");
@@ -184,7 +184,7 @@ public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, In
         }
 
         // 增加前置AGV功能节点
-        taskNodeList = this.addSupportNodes(supportNodes, true, task.getId(), taskNodeList, lastNode, zoneName);
+        taskNodeList = this.addSupportNodes(supportNodes, true, task, taskNodeList, lastNode, zoneName);
 
         LbqWrapper<ResourceBusiness> resourceBusinessWrapper = new LbqWrapper<ResourceBusiness>();
         resourceBusinessWrapper.eq(ResourceBusiness::getName, INSPECTION_RESOURCE_NAME);
@@ -212,7 +212,7 @@ public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, In
                     taskNode.setFindAgvFlag("0");
                 }
                 //节点默认使用抽检序的任务ID
-                taskNode.setTaskId(task.getId()).setOrderId(task.getOrderId())
+                taskNode.setTaskId(task.getId()).setOrderId(task.getOrderId()).setProcedureId(task.getProcedureId())
                         .setTaskNodeNo(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TASK_NODE));
                 taskNode.setAutoNode(autoCode).setNodeNo(autoCode.getNo()).setCompleteBatchNo(task.getCompleteBatchNo())
                         .setExeStatus("1").setPrority(lastNode.getPrority()+1+taskNodeList.size()).setNodeName("抽检:"+autoCode.getName()).setCreateTime(LocalDateTime.now());
@@ -266,7 +266,7 @@ public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, In
 
 
         // 增加后置AGV功能节点
-        taskNodeList  = this.addSupportNodes(supportNodes, false, task.getId(), taskNodeList, lastNode, zoneName);
+        taskNodeList  = this.addSupportNodes(supportNodes, false, task, taskNodeList, lastNode, zoneName);
 
         taskNodeList.forEach(System.out::println);