朱园亮 / xingyun-erp · Commits

Commit 8ab7409976d1011ae23531f123993dc6e2bd93a2

Authored by yeqianyong
1 parent 094b554b

楚江ERP-订货单变更逻辑

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
@@ -289,11 +289,6 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR @@ -289,11 +289,6 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
289 data.setWorkshopCode(workshop.getCode()); 289 data.setWorkshopCode(workshop.getCode());
290 } 290 }
291 } 291 }
292 - // 获取办事处数据  
293 - String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());  
294 - if (StringUtils.isNotBlank(deptCode)) {  
295 - data.setDeptCode(deptCode);  
296 - }  
297 // 更新订货单物料行 292 // 更新订货单物料行
298 // 先删再增 293 // 先删再增
299 List<CreatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList(); 294 List<CreatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList();
@@ -305,6 +300,11 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR @@ -305,6 +300,11 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
305 // 重新发起流程 300 // 重新发起流程
306 Boolean output = data.getOutput(); 301 Boolean output = data.getOutput();
307 if (BooleanUtils.isTrue(output)) { 302 if (BooleanUtils.isTrue(output)) {
  303 + // 获取办事处数据
  304 + String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
  305 + if (StringUtils.isNotBlank(deptCode)) {
  306 + data.setDeptCode(deptCode);
  307 + }
308 flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", vo.getId(), "SPEC_CHANGE_CONFIRM", data); 308 flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", vo.getId(), "SPEC_CHANGE_CONFIRM", data);
309 } else { 309 } else {
310 flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", vo.getId(), BPM_FLAG, data); 310 flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", vo.getId(), BPM_FLAG, data);
@@ -81,7 +81,7 @@ public class NodeFinishListener implements Listener { @@ -81,7 +81,7 @@ public class NodeFinishListener implements Listener {
81 } 81 }
82 } else if ("SPEC_CHANGE_SUBMIT".equals(businessType)) { 82 } else if ("SPEC_CHANGE_SUBMIT".equals(businessType)) {
83 // 订货单变更提交 83 // 订货单变更提交
84 - if ("final_node".equals(nodeCode) 84 + if (("final_node_1".equals(nodeCode) || "final_node_2".equals(nodeCode) || "final_node_3".equals(nodeCode) || "final_node_4".equals(nodeCode))
85 && (FlowInstanceStatus.REFUSE.getCode().equals(flowStatus) || FlowInstanceStatus.REVOKE.getCode().equals(flowStatus))) { 85 && (FlowInstanceStatus.REFUSE.getCode().equals(flowStatus) || FlowInstanceStatus.REVOKE.getCode().equals(flowStatus))) {
86 // 标识订货单已产出 86 // 标识订货单已产出
87 orderChangeRecordService.output(businessId); 87 orderChangeRecordService.output(businessId);