From bb288c2bf2cc069eea49c550b4c87c282188e8fd Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 15 Jan 2025 14:19:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E8=BD=A6=E9=A2=84?= =?UTF-8?q?=E6=8F=90=E6=8E=A8=E5=87=AD=E8=AF=815?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 50 ++++++++++++++----- .../ScmVehrebateCheckapplyService.java | 2 + 2 files changed, 40 insertions(+), 12 deletions(-) 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 e17fe25da0..f0c3357280 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 @@ -264,8 +264,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { bennian = bennian.add(amount); } total = total.add(amount); - deptNo = voucherDetail.getDeptCode(); - manufacturer = voucherDetail.getManufacturer(); + if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) { + deptNo = voucherDetail.getDeptCode(); + } + if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) { + manufacturer = voucherDetail.getManufacturer(); + } timeFlag = voucherDetail.getTimeFlag(); } if (shangnian.compareTo(BigDecimal.ZERO) != 0) { @@ -402,12 +406,17 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { String timeFlag = ""; List voucherDetails = voucher.getVoucherDetails(); if (!voucherDetails.isEmpty()) { + for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { timeFlag = voucherDetail.getTimeFlag(); if (!voucherDetail.getRemarks().equals("金融贴息")) { - deptNo = voucherDetail.getDeptCode(); + if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) { + deptNo = voucherDetail.getDeptCode(); + } + } + if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) { + manufacturer = voucherDetail.getManufacturer(); } - manufacturer = voucherDetail.getManufacturer(); if (voucherDetail.getRemarks().equals("金融贴息")) { if (voucherDetail.getSceneCode().equals("1161.01.16")) { cjwdxJR = cjwdxJR.add(voucherDetail.getAmount()); @@ -525,6 +534,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { } log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher)); return voucherService.saveVoucher(newVoucher); + } @Override @@ -549,8 +559,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { List voucherDetails = voucher.getVoucherDetails(); if (!voucherDetails.isEmpty()) { for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { - deptNo = voucherDetail.getDeptCode(); - manufacturer = voucherDetail.getManufacturer(); + if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) { + deptNo = voucherDetail.getDeptCode(); + } + if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) { + manufacturer = voucherDetail.getManufacturer(); + } timeFlag = voucherDetail.getTimeFlag(); if (voucherDetail.getSceneCode().equals("1161.02.15")) { snfl = snfl.add(voucherDetail.getAmount()); @@ -639,8 +653,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { if (!voucherDetails.isEmpty()) { for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { timeFlag = voucherDetail.getTimeFlag(); - deptNo = voucherDetail.getDeptCode(); - manufacturer = voucherDetail.getManufacturer(); + if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) { + deptNo = voucherDetail.getDeptCode(); + } + if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) { + manufacturer = voucherDetail.getManufacturer(); + } if (!voucherDetail.getType().equals("行销活动")) { if (voucherDetail.getRemarks().equals("返利上传")) { if (voucherDetail.getSceneCode().equals("1161.01.16")) { @@ -856,8 +874,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { if (!voucherDetails.isEmpty()) { for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { timeFlag = voucherDetail.getTimeFlag(); - deptNo = voucherDetail.getDeptCode(); - manufacturer = voucherDetail.getManufacturer(); + if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) { + deptNo = voucherDetail.getDeptCode(); + } + if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) { + manufacturer = voucherDetail.getManufacturer(); + } if (voucherDetail.getSceneCode().equals("1161.02.15")) { sn = sn.add(voucherDetail.getAmount()); } @@ -926,8 +948,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { if (!voucherDetails.isEmpty()) { for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { timeFlag = voucherDetail.getTimeFlag(); - deptNo = voucherDetail.getDeptCode(); - manufacturer = voucherDetail.getManufacturer(); + if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) { + deptNo = voucherDetail.getDeptCode(); + } + if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) { + manufacturer = voucherDetail.getManufacturer(); + } BigDecimal amount = voucherDetail.getAmount(); if (voucherDetail.getRemarks().equals("返利上传")) { if (voucherDetail.getSceneCode().equals("1161.01.16")) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index 99b0d051dd..df85e71e46 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -711,6 +711,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService