From 60f9617eca922a81deebb73f0a23a464655a6aec Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Fri, 31 Oct 2025 11:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BC=9A=E8=AE=A1=E6=9C=9F=E9=97=B4=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/FundingplanapplyPlugin.java | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java index 88bb8e8..ad80349 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java @@ -65,7 +65,7 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin //设置期间 carryCurrentPeriodAndDate(); //初始化值 - initData(org); + initData(org,null); } //获取登录人的主职部门，用户的非兼职部门就是主职部门 @@ -103,7 +103,7 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin /** * 自动带入 今年最新的 “年初应收余额”和“年初应付余额 */ - public void initData(DynamicObject org){ + public void initData(DynamicObject org,DynamicObject periodParam){ int year = LocalDate.now().getYear(); List searchFilterList = new ArrayList<>(); @@ -211,8 +211,13 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin } Object periodObj = this.getModel().getValue("zcgj_period"); - if(periodObj!=null){ - DynamicObject period = (DynamicObject) periodObj; + if(periodObj!=null || periodParam !=null){ + DynamicObject period = null; + if(periodParam!=null){ + period = periodParam; + }else{ + period = (DynamicObject) periodObj; + } List searchFilterListzj = new ArrayList<>(); searchFilterListzj.add(new QFilter("zcgj_org", QCP.equals, org.getLong("id"))); searchFilterListzj.add( new QFilter("zcgj_period.number", QCP.equals, period.getString("number"))); @@ -310,7 +315,11 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin } }else if(name.equals("zcgj_org")){ DynamicObject org = (DynamicObject) changeData.getNewValue(); - initData(org); + initData(org,null); + }else if(name.equals("zcgj_period")){ + DynamicObject org = (DynamicObject) this.getModel().getValue("zcgj_org"); + DynamicObject periodParam = (DynamicObject) changeData.getNewValue(); + initData(org,periodParam); }else if(name.equals("zcgj_allplannedbankaccept")){//银行承兑 BigDecimal amount = (BigDecimal) changeData.getNewValue(); DynamicObjectCollection zcgjFundplyentry = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_fundplyentry"); @@ -437,14 +446,21 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin dynamicObject.set("zcgj_proxyamount",zcgjSupplyamt2);//其中:公司代付金额 dynamicObject.set("zcgj_amountfield",zcgjSupplyamt2);//财务核定总金额 dynamicObject.set("zcgj_hdproxyamount",zcgjSupplyamt2);//财务核定金额（代付） - dynamicObject.set("zcgj_amount_remaining",zcgjSupplyamt2); + BigDecimal zcgjAmountRemaining = dynamicObject.getBigDecimal("zcgj_amount_remaining"); + if(zcgjAmountRemaining==null){ + dynamicObject.set("zcgj_amount_remaining",BigDecimal.ZERO); + } }else if("QTJRCP".equals(zcgjSetttype)){ dynamicObject.set("zcgj_applymonthamt",zcgjOtheramt2); dynamicObject.set("zcgj_hdamount",BigDecimal.ZERO); dynamicObject.set("zcgj_proxyamount",zcgjOtheramt2);//其中:公司代付金额 dynamicObject.set("zcgj_amountfield",zcgjOtheramt2);//财务核定总金额 dynamicObject.set("zcgj_hdproxyamount",zcgjOtheramt2);//财务核定金额（代付） - dynamicObject.set("zcgj_amount_remaining",zcgjOtheramt2); + BigDecimal zcgjAmountRemaining = dynamicObject.getBigDecimal("zcgj_amount_remaining"); + // dynamicObject.set("zcgj_amount_remaining",zcgjOtheramt2); + if(zcgjAmountRemaining==null){ + dynamicObject.set("zcgj_amount_remaining",BigDecimal.ZERO); + } } }