From 187a2f9b6db2b0cd9cc59926963facdc25d66ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?= <9463626+zhou-junjiezjj@user.noreply.gitee.com> Date: Tue, 21 Mar 2023 20:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/pdm/service/DeviceService.java | 6 ------ .../java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java index d19deb7c..27e94ca8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java @@ -31,12 +31,6 @@ public interface DeviceService { */ List queryAll(Map whereJson); - /** - * 根据ID查询 - * @param device_code ID - * @return Device - */ - DeviceDto findById(String device_code); /** * 根据编码查询 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java index 1333144c..91d5ef52 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java @@ -56,7 +56,7 @@ public class DeviceServiceImpl implements DeviceService { @Override public DeviceDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("pdm_bi_device"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + JSONObject json = wo.query("device_code ='" + code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(json)){ return json.toJavaObject( DeviceDto.class); }