From d6a98be0ad1560e5fdf0b8f1f4451fb2df92fbca Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Thu, 10 Apr 2025 16:17:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=98=E6=AC=BE=E5=8D=95?= =?UTF-8?q?=E5=AE=9E=E4=BB=98=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java | 6 ++++-- .../fin/biz/finpaymentrecord/FinPaymentrecordService.java | 4 ++++ .../anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java index 0f2b62b519..6657292ff6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java @@ -3,9 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -117,6 +115,10 @@ public class ApPayBill { @NotBlank(message = "FPAYTOTALAMOUNTFOR不能为空") //表体-应付金额:FPAYTOTALAMOUNTFOR public double FPAYTOTALAMOUNTFOR; + + @JsonProperty("FREALPAYAMOUNTFOR_D")//表体-实付金额:FREALPAYAMOUNTFOR_D + public double FREALPAYAMOUNTFOR_D; + @JsonProperty("FACCOUNTID") @NotBlank(message = "FACCOUNTID不能为空") //我方银行账号:FACCOUNTID 第1行分录，银行业务的结算方式，我方银行相关信息必录 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 4c4ac17d91..6c30d32e36 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 @@ -688,11 +688,15 @@ public class FinPaymentrecordService extends MybatisBaseService 0) { ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY(); //手续费 + BigDecimal FHANDLINGCHARGEFOR = BigDecimal.ZERO; if (null != finPaymentrecord.getPaymentCharges()) { fpaybillentry.setFHANDLINGCHARGEFOR(finPaymentrecord.getPaymentCharges().doubleValue()); + FHANDLINGCHARGEFOR = finPaymentrecord.getPaymentCharges(); } //应付金额 fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue()); + //实付金额 + fpaybillentry.setFREALPAYAMOUNTFOR_D(FHANDLINGCHARGEFOR.add(finPaymentrecord.getCost()).doubleValue()); //登账日期 fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate())); //我方银行账号 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json index 4401dd83e9..7ee6969f21 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json @@ -9,7 +9,7 @@ "FPAYTOTALAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR, "FPAYAMOUNTFOR_E": @KD_FPAYTOTALAMOUNTFOR, "FSETTLEPAYAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR, - "FREALPAYAMOUNTFOR_D": @KD_FPAYTOTALAMOUNTFOR, + "FREALPAYAMOUNTFOR_D": @KD_FREALPAYAMOUNTFOR_D, "FPAYAMOUNT_E": @KD_FPAYTOTALAMOUNTFOR, "FACCOUNTID": {"FNumber":"@KD_FACCOUNTID"}, "FPOSTDATE": "@KD_FPOSTDATE",