From ed40a8dd8bbe36fc8ab492903fc5da1b308aecb7 Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Fri, 5 Sep 2025 16:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=92=8C=E6=94=AF=E5=87=BA=E8=B4=A2=E5=8A=A1=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=8F=91=E7=A5=A8=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/MaterialInbFinaceConfirmeInvoicePlugin.java     | 9 +++++++--
 .../form/OutContractFinaceConfirmeInvoicePlugin.java     | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbFinaceConfirmeInvoicePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbFinaceConfirmeInvoicePlugin.java
index ed9a32a..9c178d3 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbFinaceConfirmeInvoicePlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbFinaceConfirmeInvoicePlugin.java
@@ -119,7 +119,12 @@ public class MaterialInbFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
         } else {
             currencyId = ((DynamicObject) this.getModel().getValue("stdcurrency")).getLong("id");//本位币别
         }
-        long orgId = ((DynamicObject) this.getModel().getValue("fiaccountorg")).getLong("id");//财务记账组织
+        DynamicObject fiaccountorg = (DynamicObject) this.getModel().getValue("fiaccountorg");//财务记账组织
+        if (fiaccountorg == null) {
+            this.getView().showErrorNotification("清先填写财务记账组织！");
+            return;
+        }
+        long orgId = fiaccountorg.getLong("id");//财务记账组织
         QFilter filter = new QFilter("org", "=", orgId);
         filter.and(new QFilter("isclaimed", "=", false));
         filter.and(new QFilter("billstatus", "=", "C"));
@@ -130,7 +135,7 @@ public class MaterialInbFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
         filter1.and(new QFilter("billstatus", "=", "C"));
         DynamicObject contract = (DynamicObject) this.getModel().getValue("contract");//合同
         String matinsource = (String) this.getModel().getValue("matinsource");//入库来源
-        if (contract != null && matinsource.equals("1")) {
+        if (contract != null ) {
             //入库来源为合同清单且合同字段不为空时，使用合同过滤
             long contractId = contract.getLong("id");
             filter1.and(new QFilter("contract", "=", contractId));
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 f83a28e..450a615 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
@@ -83,7 +83,12 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
 
     private void showInvoice(String entryType) {
         long currencyId = ((DynamicObject)this.getModel().getValue("zcgj_currency")).getLong("id");
-        long orgId = ((DynamicObject)this.getModel().getValue("zcgj_invoice_org")).getLong("id");
+        DynamicObject zcgj_invoice_org = (DynamicObject) this.getModel().getValue("zcgj_invoice_org");
+        if (zcgj_invoice_org == null){
+            this.getView().showErrorNotification("清先填写发票企业名称！");
+            return;
+        }
+        long orgId = zcgj_invoice_org.getLong("id");
         QFilter filter = new QFilter("org", "=", orgId);
         filter.and(new QFilter("isclaimed", "=", false));
         filter.and(new QFilter("billstatus", "=", "C"));