From bd1d4feea4f9522c69ef4c0fd72b1221eae5201f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 七月 2025 14:41:06 +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 | 10 ++++------
1 files changed, 4 insertions(+), 6 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 7a53b72..583ebdf 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
@@ -27,6 +27,8 @@
return OrderType.ORDER_IN.type;
} else if (desc.equals(OrderType.ORDER_OUT.desc)) {
return OrderType.ORDER_OUT.type;
+ } else if (desc.equals(OrderType.ORDER_CHECK.desc)) {
+ return OrderType.ORDER_CHECK.type;
}
return null;
}
@@ -36,12 +38,8 @@
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_CHECK.type)) {
+ return OrderType.ORDER_CHECK.desc;
}
return null;
}
--
Gitblit v1.9.1