From 0437c3b6ed8ec9f2b26387997221baafed6eae6b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 三月 2026 12:41:35 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java |  177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 176 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 6cc5715..a514751 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
@@ -16,14 +16,34 @@
     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_OTHER("14", "鍏跺畠鍑哄簱鍗�");
+    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_OTHER2007("91", "璋冩嫧鐢宠鍗�"),
+    ORDER_WORK_TYPE_OTHER2008("92", "鐩存帴璋冩嫧鍗�"),
+    ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION("21", "姝e父棰嗘枡澶囨枡鍗�"),
+    ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION("22", "鐢熶骇琛ユ枡澶囨枡鍗�");
 
 
     OrderWorkType(String type, String desc) {
@@ -39,6 +59,22 @@
             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_OTHER_IN1008.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.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)) {
@@ -63,6 +99,26 @@
             return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type;
         } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) {
             return OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2001.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2001.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2002.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2002.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2003.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2003.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2004.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2004.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2005.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2005.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2007.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2007.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2008.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2008.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type;
         }
         return null;
     }
@@ -77,6 +133,22 @@
         if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc)) {
             return OrderType.ORDER_IN.type;
         } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.desc)) {
+            return OrderType.ORDER_IN.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.desc)) {
+            return OrderType.ORDER_IN.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.desc)) {
+            return OrderType.ORDER_IN.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.desc)) {
+            return OrderType.ORDER_IN.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.desc)) {
+            return OrderType.ORDER_IN.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.desc)) {
+            return OrderType.ORDER_IN.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.desc)) {
+            return OrderType.ORDER_IN.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.desc)) {
+            return OrderType.ORDER_IN.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.desc)) {
             return OrderType.ORDER_IN.type;
         } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc)) {
             return OrderType.ORDER_IN.type;
@@ -94,6 +166,20 @@
             return OrderType.ORDER_OUT.type;
         } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc)) {
             return OrderType.ORDER_OUT.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2001.desc)) {
+            return OrderType.ORDER_OUT.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2002.desc)) {
+            return OrderType.ORDER_OUT.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2003.desc)) {
+            return OrderType.ORDER_OUT.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2004.desc)) {
+            return OrderType.ORDER_OUT.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2005.desc)) {
+            return OrderType.ORDER_OUT.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2007.desc)) {
+            return OrderType.ORDER_TRANSFER.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2008.desc)) {
+            return OrderType.ORDER_TRANSFER.type;
         } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc)) {
             return OrderType.ORDER_CHECK.type;
         } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc)) {
@@ -102,13 +188,82 @@
             return OrderType.ORDER_TRANSFER.type;
         } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) {
             return OrderType.ORDER_REVISE.type;
+        }else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.desc)) {
+            return OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.desc)) {
+            return OrderType.ORDER_OUT.type;
+        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.desc)) {
+            return OrderType.ORDER_OUT.type;
         }
         return null;
+    }
+
+    /**
+     * @author Ryan
+     * @date 2025/8/26
+     * @description: 鑾峰彇璁㈠崟绫诲瀷
+     * @version 1.0
+     */
+    public static String getOrderTypeUpdate(String desc) {
+        if (desc.equals("PUR_ReceiveBill")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.type;
+        } else if (desc.equals("STK_InStock")) {
+            return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type;
+        } else if (desc.equals("PUR_MRAPP")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.type;
+        } else if (desc.equals("PUR_MRB")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.type;
+        } else if (desc.equals("SAL_RETURNNOTICE")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.type;
+        } else if (desc.equals("SAL_RETURNSTOCK")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.type;
+        } else if (desc.equals("PRD_ReturnMtrl")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.type;
+        } else if (desc.equals("PRD_INSTOCK")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.type;
+        } else if (desc.equals("PRD_MORPT")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.type;
+        } else if (desc.equals("STK_MISCELLANEOUS")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type;
+        } else if (desc.equals("SAL_DELIVERYNOTICE")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2001.type;
+        } else if (desc.equals("SAL_OUTSTOCK")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2002.type;
+        } else if (desc.equals("STK_OutStockApply")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2003.type;
+        } else if (desc.equals("PRD_PickMtrl")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2004.type;
+        } else if (desc.equals("PRD_FeedMtrl")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2005.type;
+        } else if (desc.equals("STK_MisDelivery")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER.type;
+        } else if (desc.equals("STK_TRANSFERAPPLY")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2007.type;
+        } else if (desc.equals("STK_TransferDirect")) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2008.type;
+        }
+        return desc;
     }
 
     public static String getWorkDesc(String type) {
         if (type.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
             return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.desc;
         } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
             return OrderWorkType.ORDER_WORK_TYPE_PROD.desc;
         } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
@@ -133,8 +288,28 @@
             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;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2001.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2001.desc;
+        }  else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2002.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2002.desc;
+        }  else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2003.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2003.desc;
+        }  else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2004.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2004.desc;
+        }  else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2005.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2005.desc;
+        }  else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2007.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2007.desc;
+        }  else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2008.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_OTHER2008.desc;
         } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type)) {
             return OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc;
+        }else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.desc;
+        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type)) {
+            return OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.desc;
         }
         return null;
     }

--
Gitblit v1.9.1