From f2e7521e7740f32fa84d236405f6a78786eaaed1 Mon Sep 17 00:00:00 2001
From: gtsxc <3272660260@qq.com>
Date: 星期五, 28 二月 2025 08:52:11 +0800
Subject: [PATCH] #新增方法calcWhiteList,把结束节点设置白名单

---
 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