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