violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix： 1.订舱通知单选择F7时过滤

Browse Source
This commit is contained in:
ljw 2025-03-01 06:25:15 +08:00 committed by 25655
parent f0c13f3856
commit 7a671ac93e
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
View File

@ -763,17 +763,18 @@ public class SalesOrderUtils {
products = (DynamicObject) model.getValue("yem_bd_products"); products = (DynamicObject) model.getValue("yem_bd_products");
} }
String number = products.getString("number");
long id = 0L; long id = 0L;
QFilter qFilter = new QFilter("enable", QCP.equals, "1"); QFilter qFilter = new QFilter("enable", QCP.equals, "1");
String number = products.getString("number");
DynamicObject billtype = (DynamicObject) model.getValue("yem_billtype"); DynamicObject billtype = (DynamicObject) model.getValue("yem_billtype");
String type = billtype.getString("number"); 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 ("Z".equals(businesssort)) {
if (YEM.isNotEmpty(productmodel)) { if (YEM.isNotEmpty(productmodel)) {
id = productmodel.getLong("yem_products.id"); id = productmodel.getLong("id");
qFilter.and(new QFilter("yem_bd_declarationele.yem_productstree.id", QCP.equals, id)); qFilter.and(new QFilter("yem_bd_declarationele.yem_baseproductstree.id", QCP.equals, id));
qFilter.and(new QFilter("enable", QCP.equals, "1")); 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) { if ("yem_hscode".equals(currentFilterKey) && customclass != null) {
qFilter.and(new QFilter("yem_customclass.id", QCP.equals, customclass.getLong("id"))); 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()); return BusinessDataServiceHelper.load("yem_bd_declarationele", selectfields, qFilter.toArray());
} }