采购申请审批，采购订单审批增加可修改主表数据逻辑

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -321,6 +321,12 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
 
                 //在审批中，更新明细数据的（先删除，再新增）
                 if (purchaseApproval.getStatusId() == BizBillStatus.APPROVING.getId() || purchaseApproval.getStatusId() == BizBillStatus.APPLYING.getId()){
+                    //更新主表信息
+                    purchaseApproval.setBsart(sapPurchaseApproval.getBsart());
+                    purchaseApproval.setBatxt(sapPurchaseApproval.getBatxt());
+                    purchaseApproval.setKnttp(sapPurchaseApproval.getKnttp());
+                    purchaseApproval.setEkgrp(sapPurchaseApproval.getEkgrp());
+
                     List<SapPurchaseApprovalItem> itemList = sapPurchaseApprovalItemApplication.querySapPurchaseApprovalItems(purchaseApproval.getId());
                     List<String> collect = itemList.stream().map(SapPurchaseApprovalItem::getId).collect(Collectors.toList());
                     sapPurchaseApprovalItemApplication.deleteByIds(collect);

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -346,6 +346,17 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                 }
                 //在审批中，更新明细数据的（先删除，再新增）
                 if (purchaseOrder.getStatusId() == BizBillStatus.APPROVING.getId() || purchaseOrder.getStatusId() == BizBillStatus.APPLYING.getId()){
+                    //更新订单主表数据
+                    purchaseOrder.setBsart(sapPurchaseOrder.getBsart());
+                    purchaseOrder.setBatxt(sapPurchaseOrder.getBatxt());
+                    purchaseOrder.setEkgrp(sapPurchaseOrder.getEkgrp());
+                    purchaseOrder.setEknam(sapPurchaseOrder.getEknam());
+                    purchaseOrder.setWaers(sapPurchaseOrder.getWaers());
+                    purchaseOrder.setTotalMoney(sapPurchaseOrder.getTotalMoney());
+                    purchaseOrder.setKnttp(sapPurchaseOrder.getKnttp());
+                    purchaseOrder.setRetpo(sapPurchaseOrder.getRetpo());
+                    purchaseOrder.setNamel(sapPurchaseOrder.getNamel());
+                    purchaseOrder.setLifnr(sapPurchaseOrder.getLifnr());
                     List<SapPurchaseOrderItem> itemList = sapPurchaseOrderItemApplication.getPurchaseOrderItems(purchaseOrder.getId());
                     sapPurchaseOrderItemApplication.deletePurchaseOrderItems(itemList);
                     purchaseOrderId = purchaseOrder.getId();
@@ -530,7 +541,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                     detailMap.put("matnr2",matnr.replaceFirst("^0*", ""));
                     detailMap.put("maktx",purchaseOrderItem.getTxz01());
                     detailMap.put("msehl",purchaseOrderItem.getMsehl());
-                    number = number.add(purchaseOrderItem.getKwmeng());
+                    number = number.add(new BigDecimal(purchaseOrderItem.getMenge()));
                     //计算总额 = （含税单价+运输费）* 成品数量
                     BigDecimal netpr = purchaseOrderItem.getNetpr();//含税单价
                     BigDecimal kbetr2 = purchaseOrderItem.getKbetr2() == null ? BigDecimal.ZERO:purchaseOrderItem.getKbetr2();//运输费