From a7d5e6c4a45ca1f7bb1560ef4e76f4c1680c41db Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期六, 18 五月 2024 10:43:29 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Device.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Device.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Device.java index 86eca35..94d0b0e 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Device.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Device.java @@ -183,6 +183,15 @@ DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class); DeviceType deviceType = service.getById(this.deviceType); if (!Cools.isEmpty(deviceType)){ + return String.valueOf(deviceType.getFlag()); + } + return null; + } + + public String getDeviceTypeName$(){ + DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class); + DeviceType deviceType = service.getById(this.deviceType); + if (!Cools.isEmpty(deviceType)){ return String.valueOf(deviceType.getName()); } return null; -- Gitblit v1.9.1