From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +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 | 84 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 27 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 b871cc7..405ef34 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
@@ -9,14 +9,20 @@
*/
public enum OrderWorkType {
//璁㈠崟绫诲瀷
- ORDER_WORK_TYPE_DONE_IN("1", "瀹屽伐鍏ュ簱鍗�"),
- ORDER_WORK_TYPE_PROD("2", "鐢熶骇棰嗘枡鍗�"),
- ORDER_WORK_TYPE_PURCHASE("3", "澶栬喘鏀惰揣"),
- ORDER_WORK_TYPE_SALE("4", "閿�鍞鍗�"),
- ORDER_WORK_TYPE_RETURN("5", "鐢熶骇閫�鏂欏崟"),
- ORDER_WORK_TYPE_SUPPLIER("6", "閫�璐т緵搴斿晢鍑鸿揣鍗�"),
- ORDER_WORK_TYPE_RETURN_ORDER("7", "閿�鍞��璐у叆搴撳崟")
- ;
+ ORDER_WORK_TYPE_DONE_IN("1", "閲囪喘鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_PROD("2", "鐢熶骇鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_PURCHASE("3", "棰嗘枡閫�鍥炲叆搴撳崟"),
+ ORDER_WORK_TYPE_SALE("4", "閿�鍞��鍥炲叆搴撳崟"),
+ ORDER_WORK_TYPE_OTHER_IN("5", "鍏跺畠鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_OTHER_TERANSFER("6", "璋冩嫈鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_SUPPLIER("11", "閿�鍞嚭搴撳崟"),
+ 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_STOCK_TERANSFER("17", "璋冩嫈鍑哄簱鍗�"),
+ ORDER_WORK_TYPE_OTHER("14", "鍏跺畠鍑哄簱鍗�");
+
OrderWorkType(String type, String desc) {
this.type = type;
@@ -27,22 +33,34 @@
public String desc;
public static String getWorkType(String desc) {
- if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc)) {
- return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type;
- } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.desc)) {
- return OrderWorkType.ORDER_WORK_TYPE_PROD.type;
- } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc)) {
- return OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type;
- } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.desc)) {
- return OrderWorkType.ORDER_WORK_TYPE_SALE.type;
- } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN.desc)) {
- return OrderWorkType.ORDER_WORK_TYPE_RETURN.type;
- } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc)) {
- return OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.type;
- }else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.desc)) {
- return OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type;
- }
- return null;
+ if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_PROD.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_SALE.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.desc)) {
+ 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)) {
+ 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;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type;
+ }
+ return null;
}
public static String getWorkDesc(String type) {
@@ -54,12 +72,24 @@
return OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.type)) {
return OrderWorkType.ORDER_WORK_TYPE_SALE.desc;
- } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN.type)) {
- return OrderWorkType.ORDER_WORK_TYPE_RETURN.desc;
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.type)) {
return OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc;
- }else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) {
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) {
return OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.desc;
+ }else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.desc;
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)) {
+ 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;
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc;
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc;
}
return null;
}
--
Gitblit v1.9.1