From 1a59f2464f715bf3360bfa7c90be10f906e63e8d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 28 Oct 2024 16:19:03 +0800 Subject: [PATCH] 1 --- .../base/biz/basevehicle/BaseVehicleService.java | 4 ++-- .../finpaymentrecord/FinPaymentrecordFeign.java | 1 - .../FinPaymentrecordService.java | 2 +- .../anrui/flowable/api/utils/ProcDefEnum.java | 16 ++++++++-------- .../ScmCollectionRebateService.java | 11 +++++++++++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 0b6bfbefd6..6b8e0f90be 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/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 saveReturnSid(@RequestBody FinPaymentrecordDto dto); - @ApiOperation("修改") @PostMapping("/update") @ResponseBody diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 19d3bd1afe..c8f6069570 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/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 0) { for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) { ScmCollectionRebateVehDto scmCollectionRebateVehDto = new ScmCollectionRebateVehDto(); BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(finPaymentapplyVehicleVo.getVehiSid()).getData(); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 81a81425c8..a6329fee86 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/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"), diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index d90ca83d21..94d7e209d7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/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 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 scmCollectionRebateVehs = scmCollectionRebateDto.getScmCollectionRebateVehs(); if (!scmCollectionRebateVehs.isEmpty()) {