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 5331df36..d7a5e281 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
@@ -763,17 +763,18 @@ public class SalesOrderUtils {
             products = (DynamicObject) model.getValue("yem_bd_products");
         }
 
+        String number = products.getString("number");
+
         long id = 0L;
         QFilter qFilter = new QFilter("enable", QCP.equals, "1");
-        String number = products.getString("number");
 
         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"));
                 }
             }
@@ -802,30 +803,10 @@ public class SalesOrderUtils {
             }
         }
 
-
-//        if (qFilter != null && YEM.isNotEmpty(products)) {
-//            qFilter.and(new QFilter("yem_producttype.id", QCP.equals, products.getLong("id")));
-//        }
-
-//        if ("yem_customclass".equals(currentFilterKey)) {
-//            if (qFilter != null) {
-//                return BusinessDataServiceHelper.load("yem_bd_declarationele", selectfields, qFilter.toArray());
-//            }
-//        }
-
         if ("yem_hscode".equals(currentFilterKey) && customclass != null) {
             qFilter.and(new QFilter("yem_customclass.id", QCP.equals, customclass.getLong("id")));
         }
 
-//        if (qFilter != null) {
-//            if (customclass != null && !"yem_customclass".equals(currentFilterKey)) {
-//                qFilter.and(new QFilter("yem_customclass.id", QCP.equals, customclass.getLong("id")));
-//            }
-//
-//            if (hscode != null && !"yem_hscode".equals(currentFilterKey)) {
-//                qFilter.and(new QFilter("yem_hscodebase.id", QCP.equals, hscode.getLong("id")));
-//            }
-//        }
 
         return BusinessDataServiceHelper.load("yem_bd_declarationele", selectfields, qFilter.toArray());
     }