From 51b006cb8b5ad318e0386113ee4ff1cd8847c56c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 27 三月 2024 08:42:30 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java
index d508c7b..b51d92c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java
@@ -468,5 +468,18 @@
return null;
}
+ public String generateFlag() {
+ return this.getUuid() + "銆�" + this.getPriority() + " - " + this.getMotionCtg$() + "銆�";
+ }
+
+ public String getDeviceCtgEl(){
+ DeviceCtgService service = SpringUtils.getBean(DeviceCtgService.class);
+ DeviceCtg entity = service.getById(this.deviceCtg);
+ if (!Cools.isEmpty(entity)){
+ return String.valueOf(entity.getFlag());
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1