From f0c13f38563bb2a8903f953c8851be79e6debb1e Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Fri, 28 Feb 2025 17:32:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E7=94=B3=E6=8A=A5=E8=A6=81?=
 =?UTF-8?q?=E7=B4=A0=E6=94=B9=E5=8F=98=E8=BF=87=E6=BB=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java  | 4 ++--
 .../com/yem/wm/es/salesorder/utils/SalesOrderUtils.java     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java
index 386ebe26..ce77788e 100644
--- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java
+++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java
@@ -794,11 +794,11 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
 
         DynamicObject billtype = (DynamicObject) model.getValue("yem_billtype");
         String type = billtype.getString("number");
-        if (org.apache.commons.lang3.StringUtils.containsIgnoreCase(type, "zj")) {
+        if (org.apache.commons.lang3.StringUtils.containsIgnoreCase(type, "zj")||"yem_es_storagetrans".equals(type)) {
             if ("Z".equals(businesssort)) {
                 if (YEM.isNotEmpty(productmodel)) {
                     id = productmodel.getLong("id");
-                    qFilter.and(new QFilter("yem_bd_declarationele", QCP.equals, id));
+                    qFilter.and(new QFilter("yem_bd_declarationele.yem_baseproductstree.id", QCP.equals, id));
                     qFilter.and(new QFilter("enable", QCP.equals, "1"));
                 }
             }
diff --git a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
index e01cc091..5331df36 100644
--- a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
+++ b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
@@ -865,11 +865,11 @@ public class SalesOrderUtils {
 
         DynamicObject billtype = (DynamicObject) model.getValue("yem_billtype");
         String type = billtype.getString("number");
-        if (StringUtils.containsIgnoreCase(type, "zj")) {
+        if (StringUtils.containsIgnoreCase(type, "zj")||"yem_es_storagetrans".equals(type)) {
             if ("Z".equals(businesssort)) {
                 if (YEM.isNotEmpty(productmodel)) {
-                    id = productmodel.getLong("yem_products.id");
-                    qFilter.and(new QFilter("yem_bd_declarationele.yem_productstree.id", QCP.equals, id));
+                    id = productmodel.getLong("id");
+                    qFilter.and(new QFilter("yem_bd_declarationele.yem_baseproductstree.id", QCP.equals, id));
                     qFilter.and(new QFilter("enable", QCP.equals, "1"));
                 }
             }