Commit a403b114 authored by 1650842865's avatar 1650842865

采购申请,采购订单接口优化

parent 1d15b94b
...@@ -168,7 +168,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -168,7 +168,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId); SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId);
sapPurchaseApproval.setStatusId(status.getId()); sapPurchaseApproval.setStatusId(status.getId());
sapPurchaseApprovalRepository.save(sapPurchaseApproval); sapPurchaseApprovalRepository.save(sapPurchaseApproval);
sendSapData(sapPurchaseApproval,"Y"); sendSapData(sapPurchaseApproval,"Y","");
} }
/** /**
...@@ -216,7 +216,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -216,7 +216,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId); SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId);
sapPurchaseApproval.setStatusId(BizBillStatus.APPLYING.getId()); sapPurchaseApproval.setStatusId(BizBillStatus.APPLYING.getId());
sapPurchaseApprovalRepository.save(sapPurchaseApproval); sapPurchaseApprovalRepository.save(sapPurchaseApproval);
sendSapData(sapPurchaseApproval,"N"); sendSapData(sapPurchaseApproval,"N","0");
//终止 //终止
//workflowApplication.abortProcessInstance(delegateTask.getProcessInstanceId()); //workflowApplication.abortProcessInstance(delegateTask.getProcessInstanceId());
} }
...@@ -428,7 +428,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -428,7 +428,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
/** /**
* 远程调用sap接口,传递数据 * 远程调用sap接口,传递数据
*/ */
public void sendSapData(SapPurchaseApproval sapPurchaseApproval, String flag) { public void sendSapData(SapPurchaseApproval sapPurchaseApproval, String flag,String status) {
List<SapPurchaseApprovalItem> approvalItemList = sapPurchaseApprovalItemApplication.querySapPurchaseApprovalItems(sapPurchaseApproval.getId()); List<SapPurchaseApprovalItem> approvalItemList = sapPurchaseApprovalItemApplication.querySapPurchaseApprovalItems(sapPurchaseApproval.getId());
List<Map<String,Object>> paramList= new ArrayList<>(); List<Map<String,Object>> paramList= new ArrayList<>();
for (SapPurchaseApprovalItem sapPurchaseApprovalItem : approvalItemList) { for (SapPurchaseApprovalItem sapPurchaseApprovalItem : approvalItemList) {
...@@ -438,6 +438,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -438,6 +438,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
paramItem.put("frgkz","10"); paramItem.put("frgkz","10");
paramItem.put("bnfpo",sapPurchaseApprovalItem.getBnfpo()); paramItem.put("bnfpo",sapPurchaseApprovalItem.getBnfpo());
paramItem.put("flag",flag); paramItem.put("flag",flag);
paramItem.put("status",status);
paramList.add(paramItem); paramList.add(paramItem);
} }
......
...@@ -25,7 +25,7 @@ public interface SapPurchaseOrderApplication { ...@@ -25,7 +25,7 @@ public interface SapPurchaseOrderApplication {
void saveSapPurchaseOrderDto(SapPurchaseOrderDto sapPurchaseOrderDto); void saveSapPurchaseOrderDto(SapPurchaseOrderDto sapPurchaseOrderDto);
void sendSapDate(SapPurchaseOrder sapPurchaseOrder,String flag); void sendSapDate(SapPurchaseOrder sapPurchaseOrder,String flag,String status);
String revokeApproval(String id); String revokeApproval(String id);
......
...@@ -203,7 +203,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -203,7 +203,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId); SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
sapPurchaseOrder.setStatusId(status.getId()); sapPurchaseOrder.setStatusId(status.getId());
SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder); SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder);
this.sendSapDate(save, "Y"); this.sendSapDate(save, "Y","");
asyncWriteExecutor.execute(()-> asyncWriteExecutor.execute(()->
//创建放行条 //创建放行条
this.startSapPermit(sapPurchaseOrder) this.startSapPermit(sapPurchaseOrder)
...@@ -264,7 +264,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -264,7 +264,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId); SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
sapPurchaseOrder.setStatusId(BizBillStatus.APPLYING.getId()); sapPurchaseOrder.setStatusId(BizBillStatus.APPLYING.getId());
SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder); SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder);
this.sendSapDate(save, "N"); this.sendSapDate(save, "N","0");
// 调用 onEnd 方法 // 调用 onEnd 方法
// DelegateExecution execution = delegateTask.getExecution(); // DelegateExecution execution = delegateTask.getExecution();
// onEnd(execution); // onEnd(execution);
...@@ -369,12 +369,13 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -369,12 +369,13 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
/** /**
* 远程调用sap接口,传递数据 * 远程调用sap接口,传递数据
*/ */
public void sendSapDate(SapPurchaseOrder sapPurchaseOrder, String flag) { public void sendSapDate(SapPurchaseOrder sapPurchaseOrder, String flag,String status) {
Map<String, Object> paramItem = new HashMap<>(); Map<String, Object> paramItem = new HashMap<>();
paramItem.put("ebeln", sapPurchaseOrder.getEbeln()); paramItem.put("ebeln", sapPurchaseOrder.getEbeln());
paramItem.put("BEDNR", sapPurchaseOrder.getBillCode()); paramItem.put("BEDNR", sapPurchaseOrder.getBillCode());
paramItem.put("frgkz", "10"); paramItem.put("frgkz", "10");
paramItem.put("flag", flag); paramItem.put("flag", flag);
paramItem.put("status", status);
List<Map<String, Object>> paramList = new ArrayList<>(); List<Map<String, Object>> paramList = new ArrayList<>();
paramList.add(paramItem); paramList.add(paramItem);
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment