From 4df7d6e74b42acb1c5716ed87f26d236568b60df Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期四, 25 十二月 2025 13:01:41 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/api/enums/OrderWkType.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/api/enums/OrderWkType.java b/src/main/java/com/zy/api/enums/OrderWkType.java
index d17d2a9..37f35aa 100644
--- a/src/main/java/com/zy/api/enums/OrderWkType.java
+++ b/src/main/java/com/zy/api/enums/OrderWkType.java
@@ -3,13 +3,16 @@
 public enum OrderWkType {
 
     // 璁㈠崟绫诲瀷
-    ORDER_WK_PUR_IN("1", "閲囪喘鍏ュ簱"),
-    ORDER_WK_TRANSFER_IN("2", "璋冩嫈鍏ュ簱"),
-    ORDER_WK_SALE_IN("锛�", "閿�鍞��璐у叆搴�"),
-    ORDER_WK_BAG_IN("锛�", "濂楀寘鍏ュ簱"),
-    ORDER_WK_ORDER_OUT_EO("EO", "澶囪揣鎸囩ず娲惧伐鍗曪紙EO锛�"),
-    ORDER_WK_ORDER_OUT_SO("SO", "澶囪揣鎸囩ず娲惧伐鍗曪紙SO锛�"),
-    ORDER_WK_ORDER_OUT("14", "澶囪揣鍗�");
+    ORDER_WK_PUR_IN("0", "閲囪喘鍏ュ簱"),
+    ORDER_WK_TRANSFER_IN("1", "璋冩嫈鍏ュ簱"),
+    ORDER_WK_SALE_IN("2", "瀹㈡埛閫�璐�"),
+    ORDER_WK_BAG_IN("5", "绱㈣禂鍏ュ簱"),
+    ORDER_WK_SUPLUS_IN("7", "鎶ユ孩鍏ュ簱"),
+    ORDER_WK_PRO_UPDATE_IN("8", "浠跺彿鍙樻洿鍏ュ簱"),
+    ORDER_WK_MEGER_IN("K", "缁勫悎鎷嗛浂鍏ュ簱"),
+    ORDER_WK_ORDER_OUT_EO("11", "澶囪揣鎸囩ず娲惧伐鍗曪紙EO锛�"),
+    ORDER_WK_ORDER_OUT_SO("12", "澶囪揣鎸囩ず娲惧伐鍗曪紙SO锛�"),
+    ORDER_WK_ORDER_OUT("13", "澶囪揣鍗�");
 
     OrderWkType(String val, String desc) {
         this.val = val;
@@ -20,7 +23,10 @@
     public String desc;
 
     public static String getTypeVal(String val) {
-        if (val.equals(OrderWkType.ORDER_WK_PUR_IN.val)) {
+        if (val.equals(OrderWkType.ORDER_WK_PUR_IN.val)
+                || val.equals(OrderWkType.ORDER_WK_SUPLUS_IN.val)
+                || val.equals(OrderWkType.ORDER_WK_MEGER_IN.val)
+                || val.equals(OrderWkType.ORDER_WK_PRO_UPDATE_IN.val)) {
             return OrderType.ORDER_IN.type;
         } else if (val.equals(OrderWkType.ORDER_WK_TRANSFER_IN.val)) {
             return OrderType.ORDER_IN.type;
@@ -31,7 +37,7 @@
         } else if (val.equals(OrderWkType.ORDER_WK_ORDER_OUT_EO.val)  || val.equals(OrderWkType.ORDER_WK_ORDER_OUT_SO.val)  || val.equals(OrderWkType.ORDER_WK_ORDER_OUT.val)) {
             return OrderType.ORDER_OUT.type;
         } else {
-            return OrderType.ORDER_OUT.type;
+            return null;
         }
     }
 

--
Gitblit v1.9.1