From c01f7222dcd48a7263ee414287469c754e7de22c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 12 四月 2024 10:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
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