From 0fd3ee6f9972c6f41e1032de5a163df66102a184 Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Fri, 21 Nov 2025 16:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=8D=95=E7=94=9F=E6=88=90=E8=B4=A2=E5=8A=A1=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=8D=95=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90=E5=88=86?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InContractSettleFiConfirmWorkFlowPlugin.java      | 11 +++++++++++
 .../InContractSettleInvalidWorkFlowPlugin.java        | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java
index a32a639..b06e0d1 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java
@@ -74,6 +74,17 @@ public class InContractSettleFiConfirmWorkFlowPlugin implements IWorkflowPlugin
             inFinaceconfirm.set("zcgj_amount_all",amountAll);
             inFinaceconfirm.set("zcgj_taxamt_all",taxamtAll);
 
+            DynamicObjectCollection meteringSummaryCollection1 = inContractSettle.getDynamicObjectCollection("zcgj_metering_summary");//结算单-计量汇总
+            DynamicObjectCollection meteringSummaryCollection2 = inFinaceconfirm.getDynamicObjectCollection("zcgj_metering_summary");//财务确认单-计量汇总
+            meteringSummaryCollection2.clear();
+            for (DynamicObject meteringSummary1 : meteringSummaryCollection1){
+                DynamicObject newMeteringSummary = meteringSummaryCollection2.addNew();
+                newMeteringSummary.set("zcgj_rateval",meteringSummary1.getBigDecimal("zcgj_rateval"));//税率（%）
+                newMeteringSummary.set("zcgj_pa_amount",meteringSummary1.getBigDecimal("zcgj_pa_amount"));//含税金额
+                newMeteringSummary.set("zcgj_amountnotax",meteringSummary1.getBigDecimal("zcgj_amountnotax"));//不含税金额
+                newMeteringSummary.set("zcgj_taxamt1",meteringSummary1.getBigDecimal("zcgj_taxamt"));//税额
+            }
+
             SaveServiceHelper.saveOperate("zcgj_ec_in_finaceconfirm", new DynamicObject[]{inFinaceconfirm}, null);//支出合同实体
 
             //生成支出财务确认单 end
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java
index e4c11f8..97e4595 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java
@@ -75,6 +75,17 @@ public class InContractSettleInvalidWorkFlowPlugin implements IWorkflowPlugin {
             inFinaceconfirm.set("zcgj_amount_all",amountAll);
             inFinaceconfirm.set("zcgj_taxamt_all",taxamtAll);
 
+            DynamicObjectCollection meteringSummaryCollection1 = inContractSettle.getDynamicObjectCollection("zcgj_metering_summary");//收入合同结算单-计量汇总
+            DynamicObjectCollection meteringSummaryCollection2 = inFinaceconfirm.getDynamicObjectCollection("zcgj_metering_summary");//收入财务确认单-计量汇总
+            meteringSummaryCollection2.clear();
+            for (DynamicObject meteringSummary1 : meteringSummaryCollection1){
+                DynamicObject newMeteringSummary = meteringSummaryCollection2.addNew();
+                newMeteringSummary.set("zcgj_rateval",meteringSummary1.getBigDecimal("zcgj_rateval"));//税率（%）
+                newMeteringSummary.set("zcgj_pa_amount",meteringSummary1.getBigDecimal("zcgj_pa_amount"));//含税金额
+                newMeteringSummary.set("zcgj_amountnotax",meteringSummary1.getBigDecimal("zcgj_amountnotax"));//不含税金额
+                newMeteringSummary.set("zcgj_taxamt1",meteringSummary1.getBigDecimal("zcgj_taxamt"));//税额
+            }
+
             OperationResult ecInFinaceconfirm = SaveServiceHelper.saveOperate("zcgj_ec_in_finaceconfirm", new DynamicObject[]{inFinaceconfirm}, null);//支出合同实体
             if(ecInFinaceconfirm.isSuccess()){
                 String sourceBillId = inContractSettle.getString("zcgj_invalidbillid");