1

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -2815,8 +2815,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         new_baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
         new_baseVehicle.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
         //买断状态
-        new_baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
-        new_baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
+        new_baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.PRE_BUYOUT.getCode());
+        new_baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks());
         //采购订单类型
         new_baseVehicle.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.NG_ORDER.getCode());
         new_baseVehicle.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.NG_ORDER.getRemarks());

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -74,7 +74,6 @@ public interface FinPaymentrecordFeign {
     @ResponseBody
     public ResultBean<String> saveReturnSid(@RequestBody FinPaymentrecordDto dto);
 
-
     @ApiOperation("修改")
     @PostMapping("/update")
     @ResponseBody

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -406,7 +406,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 scmCollectionRebateDto.setUseOrgName(sysOrganizationVo.getName());
                 scmCollectionRebateDto.setOrgPath(finPaymentapply.getOrgSidPath());
                 scmCollectionRebateDto.setCreateBySid(finPaymentrecord.getCreateBySid());
-                if (!vehicleList.isEmpty()) {
+                if (vehicleList != null && vehicleList.size() > 0) {
                     for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) {
                         ScmCollectionRebateVehDto scmCollectionRebateVehDto = new ScmCollectionRebateVehDto();
                         BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(finPaymentapplyVehicleVo.getVehiSid()).getData();

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -34,17 +34,17 @@ public enum ProcDefEnum {
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
     //    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),
-    BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:3:11372504"),
+    BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:4:15107528"),
     QKBUSDELIVEREDAPPLY("欠款出库申请", "process_161otrwo:3:7192504"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
-    SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
-    SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"),
-    SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"),
-    SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"),
-    SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"),
-    SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
-    SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
+    SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:2:15037508"),
+    SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:2:15107504"),
+    SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:2:15107508"),
+    SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:2:15107512"),
+    SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:2:15107516"),
+    SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:2:15107520"),
+    SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:2:15107524"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
     BASEDISPACKAGEAPPLY("优惠包申请流程", "process_ncifet6k:4:1747504"),
     BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@@ -204,6 +204,17 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
     public ResultBean confirm(List<ScmCollectionRebateDto> dto) {
         ResultBean rb = ResultBean.fireFail();
         for (ScmCollectionRebateDto scmCollectionRebateDto : dto) {
+            scmCollectionRebateDto.setRebateTypeKey("");
+            scmCollectionRebateDto.setRebateTypeValue("");
+            scmCollectionRebateDto.setRebateName("");
+            scmCollectionRebateDto.setCalculationStandard("");
+            scmCollectionRebateDto.setEstimateRebate(BigDecimal.ZERO);
+            scmCollectionRebateDto.setWithholdingDate("");
+            scmCollectionRebateDto.setUploadDate("");
+            scmCollectionRebateDto.setUploadMoney(BigDecimal.ZERO);
+            scmCollectionRebateDto.setAdjustmentMoney(BigDecimal.ZERO);
+            scmCollectionRebateDto.setAdjustmentRemarks("");
+            scmCollectionRebateDto.setRemarks("");
             String sid = this.insertByDto(scmCollectionRebateDto);
             List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = scmCollectionRebateDto.getScmCollectionRebateVehs();
             if (!scmCollectionRebateVehs.isEmpty()) {