From 1b14e48c66a6e4918f847069780212ebc0f085d4 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Mon, 13 Jan 2025 15:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E8=B0=83=E5=B7=AE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=80=9A=E8=BF=87=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/kingdee/FinKingDeeFeign.java | 4 + .../api/kingdee/FinKingDeeFeignFallBack.java | 5 + .../fin/biz/kingdee/FinKingDeeFeignRest.java | 42 ++++ .../AdjustDetailsListVo.java | 3 + .../AdjustVehListVo.java | 1 + .../ScmFinanceAdjustDetails.java | 1 + .../ScmFinanceAdjustApplyMapper.xml | 4 +- .../ScmFinanceAdjustApplyService.java | 213 ++++++++++++++++-- 8 files changed, 256 insertions(+), 17 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index bcc4c44d2c..44b56c2605 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -83,6 +83,10 @@ public interface FinKingDeeFeign { @ResponseBody ResultBean saveJRRebatePrepareVoucher(@RequestBody @Valid GeneralVoucher voucher); + @ApiOperation("保存金融贴息差异调整凭证") + @PostMapping("/saveJRAdjustVoucher") + @ResponseBody + ResultBean saveJRAdjustVoucher(@RequestBody @Valid GeneralVoucher voucher); @ApiOperation("保存单车返利核对凭证") @PostMapping("/saveRebateReviewVoucher") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java index ddf5fab785..d9bbea601b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java @@ -59,6 +59,11 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean saveJRAdjustVoucher(@Valid GeneralVoucher voucher) { + return null; + } + @Override public ResultBean saveRebateReviewVoucher(@Valid GeneralVoucher voucher) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 83193370e3..25c7367741 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -312,6 +312,48 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { return voucherService.saveVoucher(newVoucher); } + @Override + public ResultBean saveJRAdjustVoucher(@Valid GeneralVoucher voucher) { + ResultBean rb = ResultBean.fireFail(); + Voucher newVoucher = new Voucher(); + List resultDetails = new ArrayList<>(); + if (StringUtils.isNotBlank(voucher.getUseOrgCode())) { + newVoucher.setAccountBook(voucher.getUseOrgCode()); + newVoucher.setVoucherNo(voucher.getUseOrgCode()); + } + if (StringUtils.isNotBlank(voucher.getBussDate())) { + newVoucher.setBussDate(voucher.getBussDate()); + } + List voucherDetails = voucher.getVoucherDetails(); + if (!voucherDetails.isEmpty()) { + for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { + Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 + Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方 + dto1.setSummary("客户承担金融贴息差额"); + dto2.setSummary("客户承担金融贴息差额"); + if (voucherDetail.getType().equals("上年")) { + dto1.setSubjectNo("1161.02.19"); + } else if (voucherDetail.getType().equals("本年")) { + dto1.setSubjectNo("1161.01.19"); + } + dto2.setSubjectNo("1133.10.00"); + dto1.setDimensionDept(voucherDetail.getDeptCode()); + dto1.setManufacturer(voucherDetail.getManufacturer()); + dto1.setDimensionCustom(voucherDetail.getCustomerCode()); + dto1.setMaterial(voucherDetail.getMaterial()); + dto2.setDimensionDept(voucherDetail.getDeptCode()); + dto2.setDimensionCustom(voucherDetail.getCustomerCode()); + dto1.setDebit(voucherDetail.getAmount().negate().toString()); + dto2.setDebit(voucherDetail.getAmount().toString()); + resultDetails.add(dto1); + resultDetails.add(dto2); + } + newVoucher.setResultDetails(resultDetails); + } + log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher)); + return voucherService.saveVoucher(newVoucher); + } + @Override public ResultBean saveRebateReviewVoucher(@Valid GeneralVoucher voucher) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustDetailsListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustDetailsListVo.java index 435eb70867..4da284843e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustDetailsListVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustDetailsListVo.java @@ -81,4 +81,7 @@ public class AdjustDetailsListVo { */ private String vinNo; + private String salesOrderSid; // 销售订单sid + private String checkApplySid; // 单车上传核对sid + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java index c559cfd546..24574cf5cc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java @@ -47,5 +47,6 @@ public class AdjustVehListVo { @ApiModelProperty("单车返利管理sid") private String rebateSid; // 单车返利管理sid private String salesOrderSid; // 销售订单sid + private String checkApplySid; // 单车上传核对sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java index cc84e7c207..bae822fdba 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java @@ -91,5 +91,6 @@ public class ScmFinanceAdjustDetails extends BaseEntity { @ApiModelProperty("单车返利管理sid") private String rebateSid; // 单车返利管理sid private String salesOrderSid; // 销售订单sid + private String checkApplySid; // 单车上传核对sid } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml index 66c95757a8..d503b9522e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml @@ -50,6 +50,7 @@ END AS `state` FROM (SELECT + a.sid as checkApplySid, d.vehRebateSid as rebateSid, a.useOrgSid, d.purchaseSystemSid, @@ -73,7 +74,7 @@ LEFT JOIN scm_vehrebate_checkapply as a ON d.mainSid = a.sid LEFT JOIN scm_veh_rebate as r ON d.vehRebateSid = r.sid WHERE r.adjustmentMoney < 0 AND a.nodeState = '已办结' AND d.rebateTypeValue = '金融贴息') as n - INNER JOIN anrui_buscenter.bus_sales_order as bo ON n.orderSid = bo.sid + LEFT JOIN anrui_buscenter.bus_sales_order as bo ON n.orderSid = bo.sid ${ew.sqlSegment}