From 41dd653d33d699ee155c93be3118f2a188e15098 Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Thu, 28 Aug 2025 18:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/MaterialInbPurchaseApplyPlugin.java       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java
index 257f9b4..bad7c1f 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java
@@ -43,6 +43,7 @@ import java.util.stream.Collectors;
  * 3：采购申请字段过滤逻辑加仓库修改后清空采购申请字段
  * 4：申请人部门根据物资申请人过滤部门
  * 5：申请人部门赋值逻辑
+ * 6：合同编码字段赋值
  */
 public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implements Plugin, BeforeF7SelectListener {
     @Override
@@ -95,14 +96,21 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement
                 DynamicObject purchaseApply = (DynamicObject) newValue;
                 QFilter[] qFilter = new QFilter[]{new QFilter("id", QCP.equals, purchaseApply.getPkValue())};
                 DynamicObject ecma_purchaseApply = BusinessDataServiceHelper.loadSingle("ecma_purchaseapply",
-                        "applyer,zcgj_persondepart", qFilter);//采购申请单
+                        "applyer,zcgj_persondepart,zcgj_iscontract,zcgj_contract", qFilter);//采购申请单
                 if (ecma_purchaseApply != null) {
-                    this.getModel().setValue("zcgj_reqperson", ecma_purchaseApply.get("applyer"));//物料申请人
-                    this.getModel().setValue("zcgj_applidepart", ecma_purchaseApply.get("zcgj_persondepart"));//申请人部门
+                    this.getModel().setValue("zcgj_reqperson", ecma_purchaseApply.get("applyer"));// 采购申请单-物料申请人
+                    this.getModel().setValue("zcgj_applidepart", ecma_purchaseApply.get("zcgj_persondepart"));// 采购申请单-申请人部门
+                    boolean zcgj_iscontract = ecma_purchaseApply.getBoolean("zcgj_iscontract");// 采购申请单-无合同
+                    boolean zcgj_iscontract1 = (boolean) this.getModel().getValue("zcgj_iscontract");//无合同
+                    if (zcgj_iscontract || zcgj_iscontract1) {
+                        return;
+                    }
+                    this.getModel().setValue("contract", ecma_purchaseApply.get("zcgj_contract"));//项目 ← 采购申请单-物资采购合同
                 }
             } else {
                 this.getModel().setValue("zcgj_reqperson", null);//清空物料申请人字段
                 this.getModel().setValue("zcgj_applidepart", null);//清空申请人部门字段
+                this.getModel().setValue("contract", null);//清空物资采购合同字段
             }
         } else if ("warehouse".equals(key)) {
             //仓库