审批中修改状态

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

@@ -110,9 +110,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
         if (this.isApprovalProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()){
             TaskExtension te = actApplication.loadRuntimeTaskExtension(delegateTask.getId());
             cn.hutool.core.lang.Assert.notNull(te, String.format("未查询到流程任务【%s】的扩展信息", delegateTask.getId()));

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderApplicationImpl.java

@@ -100,9 +100,7 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java

@@ -107,9 +107,7 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

topsun/src/main/java/com/huigou/topsun/mes/produceException/application/impl/ProduceExceptionApplicationImpl.java

@@ -101,9 +101,7 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
         ProduceException produceException = this.produceExceptionRepository.findOne(bizId);
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
         if (this.isApprovalProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()){
             TaskExtension te = actApplication.loadRuntimeTaskExtension(delegateTask.getId());
             cn.hutool.core.lang.Assert.notNull(te, String.format("未查询到流程任务【%s】的扩展信息", delegateTask.getId()));

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

@@ -110,9 +110,7 @@ public class UnqualifiedMaterialsApplicationImpl extends FlowBroker implements U
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
         UnqualifiedMaterials unqualifiedMaterials = this.unqualifiedMaterialsRepository.findOne(bizId);
         String result = DictUtil.getDictionaryDetailText("result", unqualifiedMaterials.getResult());
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
         if (this.isApprovalProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()){
             TaskExtension te = actApplication.loadRuntimeTaskExtension(delegateTask.getId());
             cn.hutool.core.lang.Assert.notNull(te, String.format("未查询到流程任务【%s】的扩展信息", delegateTask.getId()));

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

@@ -93,11 +93,9 @@ public class ComponentSupplyApplicationImpl extends FlowBroker implements Compon
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            ComponentSupply componentSupply = componentSupplyRepository.findOne(bizId);
-            componentSupply.setStatusId(BizBillStatus.APPROVING.getId());
-            componentSupplyRepository.save(componentSupply);
-        }
+        ComponentSupply componentSupply = componentSupplyRepository.findOne(bizId);
+        componentSupply.setStatusId(BizBillStatus.APPROVING.getId());
+        componentSupplyRepository.save(componentSupply);
     }
 
     @Override

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

@@ -257,9 +257,7 @@ public class CostCenterApplicationImpl extends FlowBroker implements CostCenterA
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -142,9 +142,7 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
         if (this.isApprovalProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
             TaskExtension te = actApplication.loadRuntimeTaskExtension(delegateTask.getId());
             cn.hutool.core.lang.Assert.notNull(te, String.format("未查询到流程任务【%s】的扩展信息", delegateTask.getId()));
@@ -332,6 +330,7 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
         for (SapCostReimbursementDetail sapCostReimbursementDetail : detailList) {
             sapCostReimbursementDetail.setBelnr1(paymentReceiptVo.getBelnr1());
             sapCostReimbursementDetail.setGjahr1(paymentReceiptVo.getGjahr1());
+            sapCostReimbursementDetail.setZpayStaus("已支付");
             costReimbursementDetailRepository.save(sapCostReimbursementDetail);
         }
         //

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

@@ -91,9 +91,7 @@ public class CustomerDelayPayApplicationImpl extends FlowBroker implements Custo
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {// 校验及预算
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     @Transactional

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

@@ -86,11 +86,9 @@ public class SapDullApplicationImpl extends FlowBroker implements SapDullApplica
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            SapDull sapDull = sapDullRepository.findOne(bizId);
-            sapDull.setStatusId(BizBillStatus.APPROVING.getId());
-            sapDullRepository.save(sapDull);
-        }
+        SapDull sapDull = sapDullRepository.findOne(bizId);
+        sapDull.setStatusId(BizBillStatus.APPROVING.getId());
+        sapDullRepository.save(sapDull);
     }
 
     @Override

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

@@ -653,9 +653,7 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
       /*  if (this.isApplyProcUnit(delegateTask)) {   //申请后的提交  去掉 改在流程中配置有责任部门来实现
            System.out.println("===============提交======================= ");
             SDO params = this.getBizAndApprovalData();

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

@@ -153,11 +153,9 @@ public class FinaCustomerApplicationImpl extends FlowBroker implements FinaCusto
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            FinaCustomerInfo finaCustomer = finaCustomerRepository.findOne(bizId);
-            finaCustomer.setStatusId(BizBillStatus.APPROVING.getId());
-            finaCustomerRepository.save(finaCustomer);
-        }
+        FinaCustomerInfo finaCustomer = finaCustomerRepository.findOne(bizId);
+        finaCustomer.setStatusId(BizBillStatus.APPROVING.getId());
+        finaCustomerRepository.save(finaCustomer);
     }
 
     //流程已办

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

@@ -132,9 +132,7 @@ public class SapFixedAssessApplicationImpl extends FlowBroker implements SapFixe
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -81,11 +81,9 @@ public class NonOrderStorageApplicationImpl extends FlowBroker implements NonOrd
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            NonOrderStorage nonOrderStorage = nonOrderStorageRepository.findOne(bizId);
-            nonOrderStorage.setStatusId(BizBillStatus.APPROVING.getId());
-            nonOrderStorageRepository.save(nonOrderStorage);
-        }
+        NonOrderStorage nonOrderStorage = nonOrderStorageRepository.findOne(bizId);
+        nonOrderStorage.setStatusId(BizBillStatus.APPROVING.getId());
+        nonOrderStorageRepository.save(nonOrderStorage);
     }
 
     @Override

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

@@ -215,14 +215,10 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
-           // BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
-            nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPROVING.getId());
-            nonProdApplyBaseInfo.setApprover(getOperator().getPersonMemberName());
-           // nonProdApplyBaseInfo.setApprovalDate(new Date());
-            nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
-        }
+        NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
+        nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPROVING.getId());
+        nonProdApplyBaseInfo.setApprover(getOperator().getPersonMemberName());
+        nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
     }
 
     @Override

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/impl/NonProducePickApplicationImpl.java

@@ -213,9 +213,7 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
         NonProducePick nonProducePick = nonProducePickRepository.findOne(bizId);
         //第一次提交推送到SAP
         if (StringUtil.isBlank(nonProducePick.getMessage()) && this.getApprovalParameter().isAdvanceProcessAction()){

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

@@ -128,11 +128,9 @@ public class SapPermitApplicationImpl extends FlowBroker implements SapPermitApp
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            SapPermit sapPermit = sapPermitRepository.findOne(bizId);
-            sapPermit.setStatusId(BizBillStatus.APPROVING.getId());
-            sapPermitRepository.save(sapPermit);
-        }
+        SapPermit sapPermit = sapPermitRepository.findOne(bizId);
+        sapPermit.setStatusId(BizBillStatus.APPROVING.getId());
+        sapPermitRepository.save(sapPermit);
     }
 
     @Override

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

@@ -137,9 +137,7 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -101,9 +101,7 @@ public class ProcessQuotedPriceApplicationImpl extends FlowBroker implements Pro
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -55,9 +55,7 @@ public class ProduceMaterialApplyApplicationImpl extends FlowBroker implements P
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {// 校验及预算
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     @Transactional

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

@@ -64,9 +64,7 @@ public class ProduceSupplierReviewApplicationImpl extends FlowBroker implements
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {// 校验及预算
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     @Transactional

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

@@ -120,9 +120,7 @@ public class ProductScrapApplyApplicationImpl extends FlowBroker implements Prod
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -148,9 +148,7 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -140,9 +140,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -130,9 +130,7 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -178,9 +178,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -79,9 +79,7 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
         SapQualityInfoRecord sapQualityInfoRecord = sapQualityInfoRecordRepository.findOne(bizId);
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            sapQualityInfoRecord.setStatusId(BizBillStatus.APPROVING.getId());
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
         if (!isApplyProcUnit(delegateTask)) {
             TaskExtension te = actApplication.loadRuntimeTaskExtension(delegateTask.getId());
             Assert.notNull(te, String.format("未查询到流程任务【%s】的扩展信息", delegateTask.getId()));

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

@@ -141,9 +141,7 @@ public class SapStatsIndicatorsApplicationImpl extends FlowBroker implements Sap
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     /**

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

@@ -167,11 +167,9 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            SuppliersInfo suppliersInfo = suppliersInfoRepository.findOne(bizId);
-            suppliersInfo.setStatusId(BizBillStatus.APPROVING.getId());
-            suppliersInfoRepository.save(suppliersInfo);
-        }
+        SuppliersInfo suppliersInfo = suppliersInfoRepository.findOne(bizId);
+        suppliersInfo.setStatusId(BizBillStatus.APPROVING.getId());
+        suppliersInfoRepository.save(suppliersInfo);
     }
 
     //流程已办

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

@@ -115,11 +115,9 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
-            SapStockTransfers sapStockTransfers = sapStockTransfersRepository.findOne(bizId);
-            sapStockTransfers.setStatusId(BizBillStatus.APPROVING.getId());
-            sapStockTransfersRepository.save(sapStockTransfers);
-        }
+        SapStockTransfers sapStockTransfers = sapStockTransfersRepository.findOne(bizId);
+        sapStockTransfers.setStatusId(BizBillStatus.APPROVING.getId());
+        sapStockTransfersRepository.save(sapStockTransfers);
     }
 
     @Override

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

@@ -214,9 +214,7 @@ public class WasteSaleApplicationImpl extends FlowBroker implements WasteSaleApp
     protected void onBeforeComplete(DelegateTask delegateTask) {
         super.onBeforeComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {// 校验及预算
-            updateStatus(bizId, BizBillStatus.APPROVING);
-        }
+        updateStatus(bizId, BizBillStatus.APPROVING);
     }
 
     @Transactional