From 5d063689e3f977c4f8cf4ac76173023e5db026a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 23 七月 2025 12:43:56 +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/OrderWorkType.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
index df2cbda..d131121 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
@@ -18,6 +18,8 @@
ORDER_WORK_TYPE_RETURN_ORDER("12", "棰嗘枡鍑哄簱鍗�"),
ORDER_WORK_TYPE_PURCHASE_RETURN("13", "閲囪喘閫�鍥炲嚭搴撳崟"),
ORDER_WORK_TYPE_STOCK_OUT("15", "搴撳瓨鍑哄簱"),
+ ORDER_WORK_TYPE_STOCK_CHECK("16", "鐩樼偣鍑哄簱"),
+
ORDER_WORK_TYPE_OTHER("14", "鍏跺畠鍑哄簱鍗�");
@@ -48,8 +50,10 @@
return OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.desc)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER.type;
- }else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc)) {
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc)) {
return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type;
}
return null;
}
@@ -75,6 +79,8 @@
return OrderWorkType.ORDER_WORK_TYPE_OTHER.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type)) {
return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc;
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc;
}
return null;
}
--
Gitblit v1.9.1