From 5f84450c25ecf4a628d5950c33db2f8374586f20 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 6 Sep 2022 11:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../em/service/impl/DevicemaintenanceitemsServiceImpl.java | 2 +- .../basedata/em/service/impl/DevicerepairitemsServiceImpl.java | 2 +- .../basedata/master/service/impl/MaterialbaseServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java index d60897b5..59598892 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java @@ -68,7 +68,7 @@ public class DevicemaintenanceitemsServiceImpl implements Devicemaintenanceitems map.put("classIds", classIds); } else if (ObjectUtil.isNotEmpty(class_idStr)) { String classIds = classstandardService.getAllChildIdStr(class_idStr); - map.put("classIds", classIds); + map.put("classIds", ""); } JSONObject json = WQL.getWO("QEM_BI_DEVICEMAINTAIN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time DESC"); return json; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java index 34b82787..3626e1ae 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java @@ -62,7 +62,7 @@ public class DevicerepairitemsServiceImpl implements DevicerepairitemsService { map.put("classIds", classIds); } else if (ObjectUtil.isNotEmpty(class_idStr)) { String classIds = classstandardService.getAllChildIdStr(class_idStr); - map.put("classIds", classIds); + map.put("classIds", ""); } JSONObject json = WQL.getWO("QEM_BI_DEVICEREPAIRITEMS01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time DESC"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java index 89334d35..fce9c2c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java @@ -61,7 +61,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { if (search.contains("\\")) { search = search.replace("\\", "\\\\\\"); } - map.put("search", search + "%"); + map.put("search", "%"+search + "%"); } //处理物料当前节点的所有子节点