From e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 七月 2025 17:10:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
index becf65f..7a53b72 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
@@ -9,12 +9,9 @@
*/
public enum OrderType {
//璁㈠崟绫诲瀷
- ORDER_PURCHASE_IN("purchase", "閲囪喘鍏ュ簱鍗�"),
ORDER_OUT("out", "鍑哄簱鍗�"),
ORDER_IN("in", "鍏ュ簱鍗�"),
- ORDER_RECEIPT("receipt", "鏀惰揣鍗�"),
- ORDER_PLAT_IN("plat in", "骞冲簱鍏ュ簱鍗�"),
-
+ ORDER_CHECK("check", "鐩樼偣鍗�");
;
OrderType(String type, String desc) {
@@ -30,12 +27,6 @@
return OrderType.ORDER_IN.type;
} else if (desc.equals(OrderType.ORDER_OUT.desc)) {
return OrderType.ORDER_OUT.type;
- } else if (desc.equals(OrderType.ORDER_PLAT_IN.desc)) {
- return OrderType.ORDER_PLAT_IN.type;
- } else if (desc.equals(OrderType.ORDER_RECEIPT.desc)) {
- return OrderType.ORDER_RECEIPT.type;
- } else if (desc.equals(OrderType.ORDER_PURCHASE_IN.desc)) {
- return OrderType.ORDER_PURCHASE_IN.type;
}
return null;
}
@@ -45,12 +36,12 @@
return OrderType.ORDER_IN.desc;
} else if (type.equals(OrderType.ORDER_OUT.type)) {
return OrderType.ORDER_OUT.desc;
- } else if (type.equals(OrderType.ORDER_PLAT_IN.type)) {
- return OrderType.ORDER_PLAT_IN.desc;
- } else if (type.equals(OrderType.ORDER_RECEIPT.type)) {
- return OrderType.ORDER_RECEIPT.desc;
- } else if (type.equals(OrderType.ORDER_PURCHASE_IN.type)) {
- return OrderType.ORDER_PURCHASE_IN.desc;
+// } else if (type.equals(OrderType.ORDER_PLAT_IN.type)) {
+// return OrderType.ORDER_PLAT_IN.desc;
+// } else if (type.equals(OrderType.ORDER_RECEIPT.type)) {
+// return OrderType.ORDER_RECEIPT.desc;
+// } else if (type.equals(OrderType.ORDER_PURCHASE_IN.type)) {
+// return OrderType.ORDER_PURCHASE_IN.desc;
}
return null;
}
--
Gitblit v1.9.1