From 9d10e600fba7901cb82990ca40203258159cd7fc Mon Sep 17 00:00:00 2001
From: zhangzhiguo <421587375@qq.com>
Date: Mon, 11 Aug 2025 15:31:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=98=E6=AC=BE=E5=A4=84=E7=90=86=E5=8D=95?=
 =?UTF-8?q?=E5=AE=9E=E4=BB=98=E9=87=91=E9=A2=9D=E5=8F=8D=E5=86=99=E5=92=8C?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=BE=85=E6=8B=A8=E4=BB=98=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=202.=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E5=8F=96=E6=95=B0=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9C=9F=E5=88=9D?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=8F=96=E6=95=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcdev/fs/plugin/common/AssistbalanceAutoData.java |  1 +
 .../plugin/operate/CasPaybillToEcFundPlanApplyOp.java | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java
index 69e3ba6..697d707 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java
@@ -133,6 +133,7 @@ public class AssistbalanceAutoData {
                     DynamicObject assistbalance
                             =BusinessDataServiceHelper.newDynamicObject("zcgj_rpt_assistbalance");
                     assistbalance.set("zcgj_debitlocal", record.getDebitlocal());
+                    assistbalance.set("zcgj_beginlocal", record.getBeginlocal());
                     assistbalance.set("zcgj_creditlocal", record.getCreditlocal());
                     assistbalance.set("zcgj_yeardebitfor", record.getYeardebitfor());
                     assistbalance.set("zcgj_yearcreditfor", record.getYearcreditfor());
diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/CasPaybillToEcFundPlanApplyOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/CasPaybillToEcFundPlanApplyOp.java
index 4dcb4e1..d2b6023 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/CasPaybillToEcFundPlanApplyOp.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/CasPaybillToEcFundPlanApplyOp.java
@@ -101,6 +101,17 @@ public class CasPaybillToEcFundPlanApplyOp extends AbstractOperationServicePlugI
                         allActamt = allActamt.add(zcgjAmountRecommended);
                         dynamicObject.set("zcgj_amountpaid", allActamt);//实付金额
                         dynamicObject.set("zcgj_amount_inpayment",amountrecommended);//
+
+                        //zcgj_amount_remaining = zcgj_hdamount - zcgj_amount_inpayment - zcgj_amountpaid
+                        //剩余待拨付金额 = 财务核定金额 - 付款处理中金额 - 实付金额
+                        BigDecimal hdamount = dynamicObject.getBigDecimal("zcgj_hdamount");
+                        if(hdamount !=null && isPay){
+                            BigDecimal subtract = hdamount.subtract(amountrecommended).subtract(allActamt);
+                            dynamicObject.set("zcgj_amount_remaining",subtract);
+                        }else if(hdamount != null){
+                            BigDecimal subtract = hdamount.add(amountrecommended).subtract(allActamt);//实付金额已经成为相反数
+                            dynamicObject.set("zcgj_amount_remaining",subtract);
+                        }
                     }
                 }
                 updateData.add(fundingplanapply);