From b21474a5ad04ebbcae5f543ca1ccb4b9c972981a Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Wed, 12 Nov 2025 15:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=8D=95=E6=A0=B9=E6=8D=AE=E6=98=AF=E5=90=A6=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=A1=AE=E8=AE=A4=E5=8D=95=E7=94=9F=E6=88=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/OutContractSettleFiConfirmWorkFlowPlugin.java | 3 ++- .../workflow/OutContractSettleInvalidWorkFlowPlugin.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java index c167bb1..341134b 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java @@ -26,7 +26,8 @@ public class OutContractSettleFiConfirmWorkFlowPlugin implements IWorkflowPlugin DynamicObject outContractSettle = BusinessDataServiceHelper.loadSingle(businessKey, entityNumber); boolean isReversabillid = outContractSettle.getBoolean("zcgj_is_reversabillid"); boolean isInvalid = outContractSettle.getBoolean("zcgj_is_invalid"); - if(!isReversabillid && !isInvalid) { + boolean nofinconfirm = outContractSettle.getBoolean("zcgj_nofinconfirm"); + if(!isReversabillid && !isInvalid && !nofinconfirm) { //如果时冲销单据 //生成支出财务确认单 start //收入合同结算 diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java index 1bbdd01..ea27cd1 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java @@ -26,7 +26,8 @@ public class OutContractSettleInvalidWorkFlowPlugin implements IWorkflowPlugin { DynamicObject outContractSettle = BusinessDataServiceHelper.loadSingle(businessKey, entityNumber); //如果时冲销单据 boolean isReversabillid = outContractSettle.getBoolean("zcgj_is_invalid"); - if(isReversabillid) { + boolean nofinconfirm = outContractSettle.getBoolean("zcgj_nofinconfirm"); + if(isReversabillid && !nofinconfirm) { DynamicObjectCollection itementry = outContractSettle.getDynamicObjectCollection("itementry"); //生成支出财务确认单 start