From 44bec6eaf27f0f147486413f777cbd081d2b6b4e Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Thu, 4 Dec 2025 14:34:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8F=91=E7=A5=A8=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/InContractFinaceConfirmeInvoicePlugin.java | 10 +++++----- .../form/OutContractFinaceConfirmeInvoicePlugin.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeInvoicePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeInvoicePlugin.java index d2f8bc1..607da1c 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeInvoicePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeInvoicePlugin.java @@ -84,14 +84,14 @@ public class InContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn im filter.and(new QFilter("billstatus", "=", "C")); filter.and(new QFilter("currency", "=", currencyId)); filter.and(new QFilter("invoicestatus", "!=", "2")); - filter.and(new QFilter("unapplyamount", ">", BigDecimal.ZERO)); + filter.and(new QFilter("unapplyamount", "!=", BigDecimal.ZERO)); QFilter filter1 = new QFilter("isclaimed", "=", true); filter1.and(new QFilter("billstatus", "=", "C")); DynamicObject contract = (DynamicObject)this.getModel().getValue("zcgj_contract"); if (contract != null) { long contractId = contract.getLong("id"); filter1.and(new QFilter("contract", "=", contractId)); - filter1.and(new QFilter("unapplyamount", ">", BigDecimal.ZERO)); + filter1.and(new QFilter("unapplyamount", "!=", BigDecimal.ZERO)); DynamicObjectCollection contInvEntryCol = this.getModel().getEntryEntity("zcgj_entryentity"); if (!contInvEntryCol.isEmpty()) { List selectedInvIds = new ArrayList(8); @@ -232,9 +232,9 @@ public class InContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn im this.getView().showTipNotification(String.format(ResManager.loadKDString("发票号码%s，已存在分录行", "PaymentApplyEditUI_22", "ec-contract-formplugin", new Object[0]), invoice.getString("invoiceno"))); } else { BigDecimal unApplyAmount = invoice.getBigDecimal("unapplyamount"); - if (unApplyAmount != null && unApplyAmount.doubleValue() <= (double)0.0F) { + /*if (unApplyAmount != null && unApplyAmount.doubleValue() <= (double)0.0F) { this.getView().showTipNotification(String.format(ResManager.loadKDString("发票号码%s，金额已经被关联完毕，不可重复使用", "PaymentApplyEditUI_23", "ec-contract-formplugin", new Object[0]), invoice.getString("invoiceno"))); - } else { + } else {*/ DynamicObject upContract = (DynamicObject)this.getModel().getValue("zcgj_contract"); int rowIndex = this.getModel().createNewEntryRow("zcgj_entryentity"); this.getModel().setValue("zcgj_invoice", invoice.getPkValue(), rowIndex); @@ -250,7 +250,7 @@ public class InContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn im invoice.set("project", (DynamicObject)this.getModel().getValue("zcgj_project")); invoice.set("connecttype", "contract"); invArr.add(invoice); - } + // } } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java index fdc4cdd..5956bea 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java @@ -100,7 +100,7 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i filter.and(new QFilter("billstatus", "=", "C")); filter.and(new QFilter("currency", "=", currencyId)); filter.and(new QFilter("invoicestatus", "!=", "2")); - filter.and(new QFilter("unapplyamount", ">", BigDecimal.ZERO)); + filter.and(new QFilter("unapplyamount", "!=", BigDecimal.ZERO)); filter.and(new QFilter("zcgj_isbind", "=", false)); //发票被 rim_expense_relation 关系绑定 QFilter filter1 = new QFilter("isclaimed", "=", true); filter1.and(new QFilter("billstatus", "=", "C")); @@ -108,7 +108,7 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i if (contract != null) { long contractId = contract.getLong("id"); filter1.and(new QFilter("contract", "=", contractId)); - filter1.and(new QFilter("unapplyamount", ">", BigDecimal.ZERO)); + filter1.and(new QFilter("unapplyamount", "!=", BigDecimal.ZERO)); DynamicObjectCollection contInvEntryCol = this.getModel().getEntryEntity("zcgj_entryentity"); if (contInvEntryCol.size() > 0) { List selectedInvIds = new ArrayList(8); @@ -251,9 +251,9 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i this.getView().showTipNotification(String.format(ResManager.loadKDString("发票号码%s，已存在分录行", "PaymentApplyEditUI_22", "ec-contract-formplugin", new Object[0]), invoice.getString("invoiceno"))); } else { BigDecimal unApplyAmount = invoice.getBigDecimal("unapplyamount"); - if (unApplyAmount != null && unApplyAmount.doubleValue() <= (double)0.0F) { + /*if (unApplyAmount != null && unApplyAmount.doubleValue() <= (double)0.0F) { this.getView().showTipNotification(String.format(ResManager.loadKDString("发票号码%s，金额已经被关联完毕，不可重复使用", "PaymentApplyEditUI_23", "ec-contract-formplugin", new Object[0]), invoice.getString("invoiceno"))); - } else { + } else {*/ DynamicObject upContract = (DynamicObject)this.getModel().getValue("zcgj_contract"); int rowIndex = this.getModel().createNewEntryRow("zcgj_entryentity"); this.getModel().setValue("zcgj_invoice", invoice.getPkValue(), rowIndex); @@ -270,7 +270,7 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i invoice.set("connecttype", "contract"); invoice.set("zcgj_isbind", true); invArr.add(invoice); - } + // } } }