From ad5fef776eb9d66a0fcfc2ddf89698c5642e0eec Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 三月 2026 08:36:24 +0800
Subject: [PATCH] 增加一个定时任务。如果拣货出库过程中,相同料箱号,存在(199 ,200)的任务 并且同时存在  101,196的任务 则101和196的任务会 自动变成199

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java
index 6fb3726..f9381c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java
@@ -16,10 +16,37 @@
     ;
 
     OrderSourceType(String val, String desc) {
-        this.val = Short.parseShort(val);
+        this.val = Integer.parseInt(val);
         this.desc = desc;
     }
 
-    public Short val;
+    public Integer val;
     public String desc;
+
+
+    public static Integer getSourceVal(String desc) {
+        if (desc.equals(OrderSourceType.ORDER_SOURCE_TYPE_ERP.desc)) {
+            return OrderSourceType.ORDER_SOURCE_TYPE_ERP.val;
+        } else if (desc.equals(OrderSourceType.ORDER_SOURCE_TYPE_SYSTEM.desc)) {
+            return OrderSourceType.ORDER_SOURCE_TYPE_SYSTEM.val;
+        } else if (desc.equals(OrderSourceType.ORDER_SOURCE_TYPE_EXCEL.desc)) {
+            return OrderSourceType.ORDER_SOURCE_TYPE_EXCEL.val;
+        } else if (desc.equals(OrderSourceType.ORDER_SOURCE_TYPE_QMS.desc)) {
+            return OrderSourceType.ORDER_SOURCE_TYPE_QMS.val;
+        }
+        return null;
+    }
+
+    public static String getSourceDesc(Integer val) {
+        if (val.equals(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val)) {
+            return OrderSourceType.ORDER_SOURCE_TYPE_ERP.desc;
+        } else if (val.equals(OrderSourceType.ORDER_SOURCE_TYPE_SYSTEM.val)) {
+            return OrderSourceType.ORDER_SOURCE_TYPE_SYSTEM.desc;
+        } else if (val.equals(OrderSourceType.ORDER_SOURCE_TYPE_EXCEL.val)) {
+            return OrderSourceType.ORDER_SOURCE_TYPE_EXCEL.desc;
+        } else if (val.equals(OrderSourceType.ORDER_SOURCE_TYPE_QMS.val)) {
+            return OrderSourceType.ORDER_SOURCE_TYPE_QMS.desc;
+        }
+        return null;
+    }
 }

--
Gitblit v1.9.1