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")); } }