From 7972683f56368cd8ce7ef8bb7f1d087416f4a3e7 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 13:23:35 +0800
Subject: [PATCH] 容器管理-编辑可入库区 选中数据排序 选择文字排序 兼容修改后的其他调用方法
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 fe65c73..26e5641 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
@@ -18,11 +18,16 @@
ORDER_WORK_TYPE_STOCK_REVISE("7", "搴撳瓨璋冩暣鍗�"),
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_NORMAL_MATERIAL_PREPARATION("21", "姝ｅ父棰嗘枡澶囨枡鍗�"),
+ ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION("22", "鐢熶骇琛ユ枡澶囨枡鍗�");
OrderWorkType(String type, String desc) {
@@ -62,6 +67,12 @@
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_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;
}
@@ -101,6 +112,12 @@
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;
}
@@ -134,6 +151,12 @@
return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.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