From 7c3fcf5d5a096932511d806978525f3bb4d722a7 Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Thu, 4 Sep 2025 15:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E7=BB=84=E7=BB=87=E8=B5=8B=E5=80=BC=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pr/plugin/form/MaterialOutBillPlugin.java | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillPlugin.java
index 23c5a84..d55ba67 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillPlugin.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * 出库单表单插件
- * 说明：1：核算组织由项目中的财务记账组织携带而来
+ * 说明：1：核算组织由仓库中的所属组织携带而来
  * 2：使用设备过滤，通过核算组织与使用设备中的使用组织比对而来过滤
  * 3：科目属性过滤和成本分解结构必录逻辑控制（废弃
  * 4：申请人部门赋值过滤
@@ -59,14 +59,21 @@ public class MaterialOutBillPlugin extends AbstractBillPlugIn implements BeforeF
     public void propertyChanged(PropertyChangedArgs e) {
         super.propertyChanged(e);
         String key = e.getProperty().getName();
-        if ("project".equals(key) || "warehouse".equals(key)) {
+        if (/*"project".equals(key) || */"warehouse".equals(key)) {
             //项目，仓库
-            Object project = this.getModel().getValue("project");// 项目
-            if (project != null) {
-                DynamicObject project1 = (DynamicObject) project;
-                this.getModel().setValue("zcgj_fiorg", project1.get("fiaccountorg"));//核算组织 ← 项目-财务记账组织
-            } else {
-                this.getModel().setValue("zcgj_fiorg", null);
+//            Object project = this.getModel().getValue("project");// 项目
+//            if (project != null) {
+//                DynamicObject project1 = (DynamicObject) project;
+//                this.getModel().setValue("zcgj_fiorg", project1.get("fiaccountorg"));//核算组织 ← 项目-财务记账组织
+//            } else {
+//                this.getModel().setValue("zcgj_fiorg", null);
+//            }
+            ChangeData[] changeSet = e.getChangeSet();
+            ChangeData changeData = changeSet[0];
+            Object newValue = changeData.getNewValue();//新值
+            if (newValue != null) {
+                DynamicObject warehouse = (DynamicObject) newValue;
+                this.getModel().setValue("zcgj_fiorg", warehouse.get("org"));
             }
         } else if ("zcgj_fiorg".equals(key)) {
             //核算组织