楚江ERP-订货单变更逻辑

@@ -289,11 +289,6 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                 data.setWorkshopCode(workshop.getCode());
             }
         }
-        // 获取办事处数据
-        String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
-        if (StringUtils.isNotBlank(deptCode)) {
-            data.setDeptCode(deptCode);
-        }
         // 更新订货单物料行
         // 先删再增
         List<CreatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList();
@@ -305,6 +300,11 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         // 重新发起流程
         Boolean output = data.getOutput();
         if (BooleanUtils.isTrue(output)) {
+            // 获取办事处数据
+            String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
+            if (StringUtils.isNotBlank(deptCode)) {
+                data.setDeptCode(deptCode);
+            }
             flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", vo.getId(), "SPEC_CHANGE_CONFIRM", data);
         } else {
             flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", vo.getId(), BPM_FLAG, data);

@@ -81,7 +81,7 @@ public class NodeFinishListener implements Listener {
             }
         } else if ("SPEC_CHANGE_SUBMIT".equals(businessType)) {
             // 订货单变更提交
-            if ("final_node".equals(nodeCode)
+            if (("final_node_1".equals(nodeCode) || "final_node_2".equals(nodeCode) || "final_node_3".equals(nodeCode) || "final_node_4".equals(nodeCode))
                     && (FlowInstanceStatus.REFUSE.getCode().equals(flowStatus) || FlowInstanceStatus.REVOKE.getCode().equals(flowStatus))) {
                 // 标识订货单已产出
                 orderChangeRecordService.output(businessId);