From 4fdedc53a0e66253bcdc74e2a7194ee4226bb222 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 三月 2026 13:30:28 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 117 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 63 insertions(+), 54 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 a514751..8afff0d 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,50 +9,59 @@
*/
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_OTHER_IN("5", "鍏跺畠鍏ュ簱鍗�"),
- ORDER_WORK_TYPE_OTHER_TERANSFER("6", "璋冩嫈鍏ュ簱鍗�"),
- ORDER_WORK_TYPE_STOCK_REVISE("7", "搴撳瓨璋冩暣鍗�"),
- ORDER_WORK_TYPE_OTHER_IN1008("71", "鏀舵枡閫氱煡鍗�"),
- ORDER_WORK_TYPE_OTHER_IN1009("72", "閫�鏂欑敵璇峰崟"),
- ORDER_WORK_TYPE_OTHER_IN1010("73", "閲囪喘閫�鏂欏崟"),
- ORDER_WORK_TYPE_OTHER_IN1011("74", "閫�璐ч�氱煡鍗�"),
- ORDER_WORK_TYPE_OTHER_IN1012("75", "閿�鍞��璐у崟"),
- ORDER_WORK_TYPE_OTHER_IN1013("76", "鐢熶骇閫�鏂欏崟"),
- ORDER_WORK_TYPE_OTHER_IN1014("77", "鐢熶骇鍏ュ簱鍗�"),
- ORDER_WORK_TYPE_OTHER_IN1015("78", "鐢熶骇姹囨姤鍗�"),
- ORDER_WORK_TYPE_SUPPLIER("11", "閿�鍞嚭搴撳崟"),
- ORDER_WORK_TYPE_RETURN_ORDER("12", "棰嗘枡鍑哄簱鍗�"),
- ORDER_WORK_TYPE_PROD_ADDITION("18", "鐢熶骇琛ユ枡"),
- ORDER_WORK_TYPE_FIX_OUT("19", "澶栧彂鍔犲伐"),
- 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_STOCK_UP("23", "澶囪揣鍑哄簱鍗�"),
- ORDER_WORK_TYPE_OTHER("14", "鍏跺畠鍑哄簱鍗�"),
- ORDER_WORK_TYPE_OTHER2001("51", "鍙戣揣閫氱煡鍗�"),
- ORDER_WORK_TYPE_OTHER2002("52", "閿�鍞嚭搴撳崟"),
- ORDER_WORK_TYPE_OTHER2003("53", "鍑哄簱鐢宠鍗�"),
- ORDER_WORK_TYPE_OTHER2004("54", "鐢熶骇棰嗘枡鍗�"),
- ORDER_WORK_TYPE_OTHER2005("55", "鐢熶骇琛ユ枡鍗�"),
+ ORDER_WORK_TYPE_DONE_IN("1", "閲囪喘鍏ュ簱鍗�","STK_InStock"),
+ ORDER_WORK_TYPE_PROD("2", "鐢熶骇鍏ュ簱鍗�",""),
+ ORDER_WORK_TYPE_PURCHASE("3", "棰嗘枡閫�鍥炲叆搴撳崟",""),
+ ORDER_WORK_TYPE_SALE("4", "閿�鍞��鍥炲叆搴撳崟",""),
+ ORDER_WORK_TYPE_OTHER_IN("5", "鍏跺畠鍏ュ簱鍗�","STK_MISCELLANEOUS"),
+ ORDER_WORK_TYPE_OTHER_TERANSFER("6", "璋冩嫈鍏ュ簱鍗�",""),
+ ORDER_WORK_TYPE_STOCK_REVISE("7", "搴撳瓨璋冩暣鍗�",""),
+ ORDER_WORK_TYPE_OTHER_IN1008("71", "鏀舵枡閫氱煡鍗�","PUR_ReceiveBill"),
+ ORDER_WORK_TYPE_OTHER_IN1009("72", "閫�鏂欑敵璇峰崟","PUR_MRAPP"),
+ ORDER_WORK_TYPE_OTHER_IN1010("73", "閲囪喘閫�鏂欏崟","PUR_MRB"),
+ ORDER_WORK_TYPE_OTHER_IN1011("74", "閫�璐ч�氱煡鍗�","SAL_RETURNNOTICE"),
+ ORDER_WORK_TYPE_OTHER_IN1012("75", "閿�鍞��璐у崟","SAL_RETURNSTOCK"),
+ ORDER_WORK_TYPE_OTHER_IN1013("76", "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl"),
+ ORDER_WORK_TYPE_OTHER_IN1014("77", "鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK"),
+ ORDER_WORK_TYPE_OTHER_IN1015("78", "鐢熶骇姹囨姤鍗�","PRD_MORPT"),
+ ORDER_WORK_TYPE_SUPPLIER("11", "閿�鍞嚭搴撳崟",""),
+ ORDER_WORK_TYPE_RETURN_ORDER("12", "棰嗘枡鍑哄簱鍗�",""),
+ ORDER_WORK_TYPE_PROD_ADDITION("18", "鐢熶骇琛ユ枡",""),
+ ORDER_WORK_TYPE_FIX_OUT("19", "澶栧彂鍔犲伐",""),
+ 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_STOCK_UP("23", "澶囪揣鍑哄簱鍗�",""),
+ ORDER_WORK_TYPE_OTHER("14", "鍏跺畠鍑哄簱鍗�","STK_MisDelivery"),
+ ORDER_WORK_TYPE_OTHER2001("51", "鍙戣揣閫氱煡鍗�","SAL_DELIVERYNOTICE"),
+ ORDER_WORK_TYPE_OTHER2002("52", "閿�鍞嚭搴撳崟","SAL_OUTSTOCK"),
+ ORDER_WORK_TYPE_OTHER2003("53", "鍑哄簱鐢宠鍗�","STK_OutStockApply"),
+ ORDER_WORK_TYPE_OTHER2004("54", "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl"),
+ ORDER_WORK_TYPE_OTHER2005("55", "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl"),
- ORDER_WORK_TYPE_OTHER2007("91", "璋冩嫧鐢宠鍗�"),
- ORDER_WORK_TYPE_OTHER2008("92", "鐩存帴璋冩嫧鍗�"),
- ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION("21", "姝e父棰嗘枡澶囨枡鍗�"),
- ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION("22", "鐢熶骇琛ユ枡澶囨枡鍗�");
+ ORDER_WORK_TYPE_OTHER2007("91", "璋冩嫧鐢宠鍗�","STK_TRANSFERAPPLY"),
+ ORDER_WORK_TYPE_OTHER2008("92", "鐩存帴璋冩嫧鍗�","STK_TransferDirect"),
+ ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION("21", "姝e父棰嗘枡澶囨枡鍗�",""),
+ ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION("22", "鐢熶骇琛ユ枡澶囨枡鍗�","");
OrderWorkType(String type, String desc) {
this.type = type;
this.desc = desc;
+ this.memo = "";
+ }
+
+
+ OrderWorkType(String type, String desc ,String memo) {
+ this.type = type;
+ this.desc = desc;
+ this.memo = memo;
}
public String type;
public String desc;
+ public String memo;
public static String getWorkType(String desc) {
if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc)) {
@@ -204,45 +213,45 @@
* @description: 鑾峰彇璁㈠崟绫诲瀷
* @version 1.0
*/
- public static String getOrderTypeUpdate(String desc) {
- if (desc.equals("PUR_ReceiveBill")) {
+ public static String getOrderTypeUpdate(String memo) {
+ if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.type;
- } else if (desc.equals("STK_InStock")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type;
- } else if (desc.equals("PUR_MRAPP")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.type;
- } else if (desc.equals("PUR_MRB")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.type;
- } else if (desc.equals("SAL_RETURNNOTICE")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.type;
- } else if (desc.equals("SAL_RETURNSTOCK")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.type;
- } else if (desc.equals("PRD_ReturnMtrl")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.type;
- } else if (desc.equals("PRD_INSTOCK")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.type;
- } else if (desc.equals("PRD_MORPT")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.type;
- } else if (desc.equals("STK_MISCELLANEOUS")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type;
- } else if (desc.equals("SAL_DELIVERYNOTICE")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2001.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER2001.type;
- } else if (desc.equals("SAL_OUTSTOCK")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2002.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER2002.type;
- } else if (desc.equals("STK_OutStockApply")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2003.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER2003.type;
- } else if (desc.equals("PRD_PickMtrl")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2004.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER2004.type;
- } else if (desc.equals("PRD_FeedMtrl")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2005.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER2005.type;
- } else if (desc.equals("STK_MisDelivery")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER.type;
- } else if (desc.equals("STK_TRANSFERAPPLY")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2007.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER2007.type;
- } else if (desc.equals("STK_TransferDirect")) {
+ } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2008.memo)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER2008.type;
}
- return desc;
+ return memo;
}
public static String getWorkDesc(String type) {
--
Gitblit v1.9.1