From 80d97d40c44165674ee0168be5f08c8ca52d3c06 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 六月 2025 09:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
index 091bb1d..043313c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
@@ -3,18 +3,18 @@
public enum SlaveType {
Crn,
- Devp,
Barcode,
Led,
Scale,
Ste,
Shuttle,
Lift,
+ Conveyor,
;
public static SlaveType findInstance(String s){
for (SlaveType type : SlaveType.values()) {
- if (type.toString().toUpperCase().equals(s)) {
+ if (type.toString().toUpperCase().equals(s.toUpperCase())) {
return type;
}
}
--
Gitblit v1.9.1