From c731084698d89c12c23180f57598d521abb97a23 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 14:15:32 +0800
Subject: [PATCH] 质检功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java |   60 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 35 insertions(+), 25 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..2f6b32b 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,16 @@
  */
 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_RETURN("5", "鍏跺畠鍏ュ簱鍗�"),
+    ORDER_WORK_TYPE_SUPPLIER("11", "閿�鍞嚭搴撳崟"),
+    ORDER_WORK_TYPE_RETURN_ORDER("12", "棰嗘枡鍑哄簱鍗�"),
+    ORDER_WORK_TYPE_PURCHASE_RETURN("13", "閲囪喘閫�鍥炲嚭搴撳崟"),
+    ORDER_WORK_TYPE_OTHER("14", "鍏跺畠鍑哄簱鍗�");
+
 
     OrderWorkType(String type, String desc) {
         this.type = type;
@@ -27,22 +29,26 @@
     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_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;
+        } 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;
+        }
+        return null;
     }
 
     public static String getWorkDesc(String type) {
@@ -58,8 +64,12 @@
             return OrderWorkType.ORDER_WORK_TYPE_RETURN.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;
         }
         return null;
     }

--
Gitblit v1.9.1