取消办结提醒；

topsun-xt/src/main/webapp/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsDetail.jsp

@@ -50,13 +50,13 @@
             <x:inputC name="vendorCode" required="false" readonly="true" label="供应商编码" labelCol="1" maxLength="64" fieldCol="2"/>
             <x:inputC name="vendorName" required="false" readonly="true" label="供应商名称" labelCol="1" maxLength="64" fieldCol="2"/>
             <x:inputC name="dutyDeptName" required="false" readonly="true" label="评审部门" labelCol="1" fieldCol="2" />
-            <x:inputC name="submitterName" required="false" readonly="true" label="提报人" labelCol="1" fieldCol="2" />
+            <x:inputC name="usnam" required="false" readonly="true" label="收货人" labelCol="1" fieldCol="2" />
         </div>
         <div class="hg-form-row">
             <x:textareaC name="exceptionDesc" required="false" label="异常描述" labelCol="1" fieldCol="10" rows="3" readonly="true"/>
         </div>
         <div class="hg-form-row">
-            <x:inputC name="usnam" required="false" readonly="true" label="仓管员" labelCol="1" fieldCol="2" />
+            <x:inputC name="submitterName" required="false" readonly="true" label="提报人" labelCol="1" fieldCol="2" />
             <x:selectC name="result" required="false" label="评审结果" labelCol="1" fieldCol="2" dictionary="result"/>
         </div>
     </div>

topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormApplicationImpl.java

@@ -168,7 +168,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         EpChangeForm epChangeForm = epChangeFormRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/application/impl/UnqualifiedMaterialsApplicationImpl.java

@@ -161,7 +161,7 @@ public class UnqualifiedMaterialsApplicationImpl extends FlowBroker implements U
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         UnqualifiedMaterials unqualifiedMaterials = unqualifiedMaterialsRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/componentSupply/application/impl/ComponentSupplyApplicationImpl.java

@@ -100,7 +100,7 @@ public class ComponentSupplyApplicationImpl extends FlowBroker implements Compon
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         ComponentSupply componentSupply = componentSupplyRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/costCenter/application/impl/CostCenterApplicationImpl.java

@@ -151,7 +151,7 @@ public class CostCenterApplicationImpl extends FlowBroker implements CostCenterA
      */
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         CostCenter costCenter = costCenterRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java

@@ -183,7 +183,7 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
      */
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapCostReimbursement sapCostReimbursement = costReimbursementRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/customerDelayPay/application/impl/CustomerDelayPayApplicationImpl.java

@@ -124,7 +124,7 @@ public class CustomerDelayPayApplicationImpl extends FlowBroker implements Custo
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         CustomerDelayPay customerDelayPay = customerDelayPayRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/dull/application/impl/SapDullApplicationImpl.java

@@ -93,7 +93,7 @@ public class SapDullApplicationImpl extends FlowBroker implements SapDullApplica
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapDull Dull = sapDullRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/impl/ExceptionReportApplicationImpl.java

@@ -426,7 +426,7 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
      */
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         BizBillStatus status = BizBillStatus.COMPLETED;
         String bizId = delegateExecution.getProcessBusinessKey();
         ExceptionReport exceptionReport = this.findById(bizId);

topsun/src/main/java/com/huigou/topsun/sap/finaCustomer/application/impl/FinaCustomerApplicationImpl.java

@@ -216,7 +216,7 @@ public class FinaCustomerApplicationImpl extends FlowBroker implements FinaCusto
      */
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         FinaCustomerInfo finaCustomer = finaCustomerRepository.findOne(bizId);
         List<FinaCustomerPay> payList = this.finaCustomerPayRepository.findAllBySId(finaCustomer.getId());

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssessApplicationImpl.java

@@ -82,7 +82,7 @@ public class SapFixedAssessApplicationImpl extends FlowBroker implements SapFixe
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapFixedAssess fixedAssess = sapFixedAssessRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssetsApplicationImpl.java

@@ -85,7 +85,7 @@ public class SapFixedAssetsApplicationImpl extends FlowBroker implements SapFixe
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapFixedAssets fixedAssets = sapFixedAssetsRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssetsMoveApplicationImpl.java

@@ -88,7 +88,7 @@ public class SapFixedAssetsMoveApplicationImpl extends FlowBroker implements Sap
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapFixedAssetsMove fixedAssetsMove = sapFixedAssetsMoveRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedRetirementApplicationImpl.java

@@ -113,7 +113,7 @@ public class SapFixedRetirementApplicationImpl extends FlowBroker implements Sap
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapRetirement fixedRetirement = sapFixedRetirementRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/material/application/impl/MaterialApplicationImpl.java

@@ -48,7 +48,7 @@ public class MaterialApplicationImpl extends FlowBroker implements MaterialAppli
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         Material material = materialRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/nonOrderStorage/application/impl/NonOrderStorageApplicationImpl.java

@@ -88,7 +88,7 @@ public class NonOrderStorageApplicationImpl extends FlowBroker implements NonOrd
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         NonOrderStorage nonOrderStorage = nonOrderStorageRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -244,7 +244,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
      */
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         ApprovalParameter parameter = getApprovalParameter();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;

topsun/src/main/java/com/huigou/topsun/sap/permit/application/impl/SapPermitApplicationImpl.java

@@ -135,7 +135,7 @@ public class SapPermitApplicationImpl extends FlowBroker implements SapPermitApp
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapPermit Permit = sapPermitRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/priceMasterData/application/impl/SapPriceMasterDataApplicationImpl.java

@@ -54,7 +54,7 @@ public class SapPriceMasterDataApplicationImpl extends FlowBroker implements Sap
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapPriceMasterData sapPriceMasterData = sapPriceMasterDataRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/application/impl/ProcessOutsourceApplicationImpl.java

@@ -165,7 +165,7 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         ProcessOutsource processOutsource = processOutsourceRepository.findOne(bizId);
@@ -232,6 +232,20 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
                         String format = dateFormat.format(processOutsourceOrderItem.getEeind());
                         processOutsourceItemVo.setEeind(format);
                     }
+                    //工序描述拼接产品编码去掉前导零+工序号去掉前导零
+                    StringBuilder stringBuilder = new StringBuilder();
+                    if (StringUtil.isNotBlank(processOutsourceOrderItem.getProductCode())){
+                        stringBuilder.append(processOutsourceOrderItem.getProductCode().replaceFirst("^0*", ""));
+                    }
+                    if (StringUtil.isNotBlank(processOutsourceOrderItem.getWempf())){
+                        stringBuilder.append("-");
+                        stringBuilder.append(processOutsourceOrderItem.getWempf().replaceFirst("^0*", ""));
+                    }
+                    if (StringUtil.isNotBlank(processOutsourceOrderItem.getTxz01())){
+                        stringBuilder.append("-");
+                        stringBuilder.append(processOutsourceOrderItem.getTxz01());
+                    }
+                    processOutsourceItemVo.setTxz01(stringBuilder.toString());
                     //设置默认值
                     //processOutsourceVo.setPersonMemberName(processOutsource.getPersonMemberName());
                     //同一个供应商下的行项目序号

topsun/src/main/java/com/huigou/topsun/sap/processQuotedPrice/application/impl/ProcessQuotedPriceApplicationImpl.java

@@ -124,7 +124,7 @@ public class ProcessQuotedPriceApplicationImpl extends FlowBroker implements Pro
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         ProcessQuotedPrice processQuotedPrice = processQuotedPriceRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/produceMaterialApply/application/impl/ProduceMaterialApplyApplicationImpl.java

@@ -88,7 +88,7 @@ public class ProduceMaterialApplyApplicationImpl extends FlowBroker implements P
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         ProduceMaterialApply produceMaterialApply = produceMaterialApplyRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/produceSupplierReview/application/impl/ProduceSupplierReviewApplicationImpl.java

@@ -97,7 +97,7 @@ public class ProduceSupplierReviewApplicationImpl extends FlowBroker implements
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         ProduceSupplierReview produceSupplierReview = produceSupplierReviewRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/application/impl/ProductScrapApplyApplicationImpl.java

@@ -143,7 +143,7 @@ public class ProductScrapApplyApplicationImpl extends FlowBroker implements Prod
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         ProductScrapApply productScrapApply = productScrapApplyRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseApplicationImpl.java

@@ -171,7 +171,7 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapPurchase sapPurchase = sapPurchaseRepository.findOne(bizId);

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

@@ -164,7 +164,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
         //取消待办任务办结提醒
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/application/impl/SapPurchaseInfoRecordApplicationImpl.java

@@ -153,7 +153,7 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapPurchaseInfoRecord sapPurchaseInfoRecord = sapPurchaseInfoRecordRepository.findOne(bizId);

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

@@ -202,7 +202,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
         //取消待办任务办结提醒
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
@@ -563,6 +563,12 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         List<String> matnrList = new ArrayList<>(purchaseOrderItems
                 .stream()
                 .map(SapPurchaseOrderItem::getMatnr2).collect(Collectors.toSet()));
+        //根据产品和单价合并明细项
+        List<MatnrNetprPair> result = purchaseOrderItems.stream()
+                .map(item -> new MatnrNetprPair(item.getMatnr2(), item.getNetpr()))
+                .distinct()  // 如果类正确实现了 equals() 和 hashCode()
+                .collect(Collectors.toList());
+
         ////获取产品信息
         List<EpProductInfoVo> productInfoVoList = this.getProductInfo(matnrList);
         map.put("productInfoVoList",productInfoVoList);
@@ -571,16 +577,16 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
 
         //获取订单明细信息
         List<Map<String,Object>> detailList = new ArrayList<>();
-        for (int i = 1; i <= matnrList.size(); i++) {
-            String matnr = matnrList.get(i-1);
+        for (int i = 1; i <= result.size(); i++) {
+            MatnrNetprPair matnrNetprPair = result.get(i-1);
             Map<String, Object> detailMap = new HashMap<>();
             detailMap.put("no",i);
             BigDecimal number = BigDecimal.ZERO;
             BigDecimal amount = BigDecimal.ZERO;
             for (int j = 0; j < purchaseOrderItems.size(); j++) {
                 SapPurchaseOrderItem purchaseOrderItem = purchaseOrderItems.get(j);
-                if (matnr.equals(purchaseOrderItem.getMatnr2())){
-                    detailMap.put("matnr2",matnr.replaceFirst("^0*", ""));
+                if (matnrNetprPair.getMatnr2().equals(purchaseOrderItem.getMatnr2())){
+                    detailMap.put("matnr2",matnrNetprPair.getMatnr2().replaceFirst("^0*", ""));
                     detailMap.put("maktx",purchaseOrderItem.getTxz01());
                     detailMap.put("msehl",purchaseOrderItem.getMsehl());
                     number = number.add(new BigDecimal(purchaseOrderItem.getMenge()));
@@ -649,8 +655,9 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         map.put("productionProcess",productInfoVoList.get(0).getProductionProcess());
         //产品和工序合并明细项，获取数量合计，loss合计，总金额合计
         List<ProductKey> uniqueProductList = new ArrayList<>(outsourceOrderItemList.stream()
-                .map(p -> new ProductKey(p.getProductCode(), p.getWempf()))
-                .collect(Collectors.toSet()));
+                .map(p -> new ProductKey(p.getProductCode(), p.getWempf(),p.getKbetr()))
+                .distinct()  // 如果类正确实现了 equals() 和 hashCode()
+                .collect(Collectors.toList()));
         map.put("eindt",outsourceOrderItemList.get(0).getEeind());
         List<Map<String,Object>> detailList = new ArrayList<>();
         for (int i = 0; i < uniqueProductList.size(); i++) {
@@ -662,7 +669,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             BigDecimal amount = BigDecimal.ZERO;
             for (int j = 0; j < outsourceOrderItemList.size(); j++) {
                 ProcessOutsourceOrderItem outsourceOrderItem = outsourceOrderItemList.get(j);
-                if (productKey.getProductCode().equals(outsourceOrderItem.getProductCode())){
+                if (productKey.getProductCode().equals(outsourceOrderItem.getProductCode()) && productKey.getKbetr().equals(outsourceOrderItem.getKbetr())){
                     detailMap.put("matnr2",outsourceOrderItem.getProductCode().replaceFirst("^0*", ""));
                     detailMap.put("maktx",outsourceOrderItem.getProductName());
                     detailMap.put("msehl",outsourceOrderItem.getMeinsName());

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/MatnrNetprPair.java

+package com.huigou.topsun.sap.purchaseOrder.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+// 或者用普通类
+@Data
+public class MatnrNetprPair implements Serializable {
+    private String matnr2;
+    private BigDecimal netpr;
+    // 构造方法、getter、setter...
+
+
+    public MatnrNetprPair(String matnr2, BigDecimal netpr) {
+        this.matnr2 = matnr2;
+        this.netpr = netpr;
+    }
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/ProductKey.java

@@ -2,6 +2,8 @@ package com.huigou.topsun.sap.purchaseOrder.domain.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author xin.lu
  * @Description: TODO
@@ -11,10 +13,12 @@ import lombok.Data;
 public class ProductKey {
     private final String productCode;
     private final String wempf;
+    private final BigDecimal kbetr;
 
-    public ProductKey(String productCode, String wempf) {
+    public ProductKey(String productCode, String wempf, BigDecimal kbetr) {
         this.productCode = productCode;
         this.wempf = wempf;
+        this.kbetr = kbetr;
     }
 
     @Override
@@ -22,11 +26,11 @@ public class ProductKey {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ProductKey that = (ProductKey) o;
-        return productCode.equals(that.productCode) && wempf.equals(that.wempf);
+        return productCode.equals(that.productCode) && wempf.equals(that.wempf) && kbetr.equals(that.kbetr);
     }
 
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(productCode, wempf);
+        return java.util.Objects.hash(productCode, wempf, kbetr);
     }
 }

topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/application/impl/SapQualityInfoRecordApplicationImpl.java

@@ -137,7 +137,7 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapQualityInfoRecord sapQualityInfoRecord = sapQualityInfoRecordRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/application/impl/SapStatsIndicatorsApplicationImpl.java

@@ -169,7 +169,7 @@ public class SapStatsIndicatorsApplicationImpl extends FlowBroker implements Sap
      */
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapStatsIndicators sapStatsIndicators = sapStatsIndicatorsRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java

@@ -261,7 +261,7 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
      */
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         SuppliersInfo suppliersInfo = suppliersInfoRepository.findOne(bizId);
         List<SuppliersPay> payList = this.suppliersPayRepository.findAllBySId(suppliersInfo.getId());

topsun/src/main/java/com/huigou/topsun/sap/transfers/application/impl/SapStockTransfersApplicationImpl.java

@@ -122,7 +122,7 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         SapStockTransfers stockTransfers = sapStockTransfersRepository.findOne(bizId);

topsun/src/main/java/com/huigou/topsun/sap/wasteSale/application/impl/WasteSaleApplicationImpl.java

@@ -247,7 +247,7 @@ public class WasteSaleApplicationImpl extends FlowBroker implements WasteSaleApp
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         WasteSale wasteSale = wasteSaleRepository.findOne(bizId);