From 3b0deb688dfe89c9cf3ff24b22c4f92f786ec1b5 Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Fri, 6 Jun 2025 16:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=92=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialInbFinaceConfirmeInvoicePlugin.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 395a79f..3b88c07 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
@@ -129,7 +129,7 @@ public class MaterialInbFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
         ListSelectedRowCollection rows = (ListSelectedRowCollection) event.getReturnData();
         DynamicObject[] invArr = new DynamicObject[rows.size()];
         int index = 0;
-        DynamicObject upContract = (DynamicObject) this.getModel().getValue("zcgj_contract");
+//        DynamicObject upContract = (DynamicObject) this.getModel().getValue("zcgj_contract");
         for (ListSelectedRow row : rows) {
             Object invoicePk = row.getPrimaryKeyValue().toString();
             int rowIndex = this.getModel().createNewEntryRow("zcgj_entryentity");
@@ -144,8 +144,8 @@ public class MaterialInbFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
             this.getModel().setValue("zcgj_applyinvoftaxamt", invoice.getBigDecimal("unapplyamount"), rowIndex);
             invArr[index++] = invoice;
             invoice.set("isclaimed", true);
-            invoice.set("contract", upContract);
-            invoice.set("project", (DynamicObject) this.getModel().getValue("zcgj_project"));
+//            invoice.set("contract", upContract);
+            invoice.set("project", (DynamicObject) this.getModel().getValue("project"));
             invoice.set("connecttype", "contract");
         }
         SaveServiceHelper.save(invArr);
@@ -252,7 +252,7 @@ public class MaterialInbFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
                     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 {
-                        DynamicObject upContract = (DynamicObject) this.getModel().getValue("zcgj_contract");
+//                        DynamicObject upContract = (DynamicObject) this.getModel().getValue("zcgj_contract");
                         int rowIndex = this.getModel().createNewEntryRow("zcgj_entryentity");
                         this.getModel().setValue("zcgj_invoice", invoice.getPkValue(), rowIndex);
                         this.getModel().setValue("zcgj_invoicecurrency", invoice.getDynamicObject("currency") == null ? Long.valueOf("0") : invoice.getDynamicObject("currency").getPkValue(), rowIndex);
@@ -263,8 +263,8 @@ public class MaterialInbFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
                         this.getModel().setValue("zcgj_unapplyinvtax", invoice.getBigDecimal("unapplyinvtax"), rowIndex);
                         this.getModel().setValue("zcgj_applyinvoftaxamt", invoice.getBigDecimal("unapplyamount"), rowIndex);
                         invoice.set("isclaimed", true);
-                        invoice.set("contract", upContract);
-                        invoice.set("project", (DynamicObject) this.getModel().getValue("zcgj_project"));
+//                        invoice.set("contract", upContract);
+                        invoice.set("project", (DynamicObject) this.getModel().getValue("project"));
                         invoice.set("connecttype", "contract");
                         invArr.add(invoice);
                     }
@@ -309,7 +309,7 @@ public class MaterialInbFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
             // DynamicObjectType subDT = this.getModel().getDynamicObjectCollection("zcgj_entryentity").getDynamicObjectType();
             QFilter filter = new QFilter("zcgj_entryentity.zcgj_invoice", "in", updateInvoicePks);
             filter.and("id", "!=", this.getModel().getDataEntity().getPkValue());
-            DynamicObjectCollection invoiceApplyEntries = QueryServiceHelper.query("zcgj_ecma_materialinb_ext", "zcgj_entryentity.zcgj_invoice", new QFilter[]{filter});
+            DynamicObjectCollection invoiceApplyEntries = QueryServiceHelper.query("ecma_materialinbill", "zcgj_entryentity.zcgj_invoice", new QFilter[]{filter});
             if (invoiceApplyEntries != null && !invoiceApplyEntries.isEmpty()) {
                 for (DynamicObject subEntry : invoiceApplyEntries) {
                     updateInvoicePks.remove(subEntry.get("zcgj_entryentity.zcgj_invoice"));