From ddf8cb028a8cfb90276545090f170fb7669e1138 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Thu, 27 Nov 2025 14:16:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=88=90=E6=9C=AC=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E8=87=AA=E5=8A=A8=E5=8F=96=E6=95=B0=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ContractCostSplitBillPluginExt.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java index 2b5baad..25ba369 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java @@ -639,6 +639,17 @@ public class ContractCostSplitBillPluginExt extends AbstractEccoBillPlugin imple for (int var19 = 0; var19 < var18; ++var19) { DynamicObject settleBill = var17[var19]; settleBill = BusinessDataServiceHelper.loadSingle(settleBill.getPkValue(), "ec_out_contract_settle"); + //二开添加↓ + DynamicObject period1 = settleBill.getDynamicObject("period"); + if (period1 != null) { + QFilter filter = new QFilter("zcgj_notinperiod.fbasedataid", QCP.in, period1.getPkValue()); + filter.and(new QFilter("number", QCP.equals, "001")); + DynamicObject zcgj_costperiod = QueryServiceHelper.queryOne("zcgj_costperiod", "id", new QFilter[]{filter});//成本期间范围 + if (zcgj_costperiod != null) { + continue; + } + } + //二开添加↑ BigDecimal historySplitAmount = (BigDecimal) settleSplitAmountMap.get(settleBill.getLong("id")); historySplitAmount = historySplitAmount == null ? BigDecimal.ZERO : historySplitAmount; BigDecimal exchangeRate = this.getBillExchangeRate(settleBill); @@ -789,6 +800,17 @@ public class ContractCostSplitBillPluginExt extends AbstractEccoBillPlugin imple for (int var64 = 0; var64 < var65; ++var64) { DynamicObject measureBill = var62[var64]; measureBill = BusinessDataServiceHelper.loadSingle(measureBill.getPkValue(), "ec_outcontractmeasure"); + //二开添加↓ + DynamicObject period1 = measureBill.getDynamicObject("period"); + if (period1 != null) { + QFilter filter = new QFilter("zcgj_notinperiod.fbasedataid", QCP.in, period1.getPkValue()); + filter.and(new QFilter("number", QCP.equals, "001")); + DynamicObject zcgj_costperiod = QueryServiceHelper.queryOne("zcgj_costperiod", "id", new QFilter[]{filter});//成本期间范围 + if (zcgj_costperiod != null) { + continue; + } + } + //二开添加↑ if (!measureBill.getBoolean("issettled")) { noSettleMeasureBills.add(measureBill); }