From 2db2c1328008ae399d8d7af56c9c6dc67a47bce8 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 4c78108..e68c8c7 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,6 +18,8 @@
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", "鐩樼偣鍑哄簱"),
@@ -66,6 +68,45 @@
return null;
}
+ /**
+ * @author Ryan
+ * @date 2025/8/26
+ * @description: 鑾峰彇璁㈠崟绫诲瀷
+ * @version 1.0
+ */
+ public static String getOrderType(String desc) {
+ 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_PURCHASE.desc)) {
+ return OrderType.ORDER_IN.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.desc)) {
+ return OrderType.ORDER_IN.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.desc)) {
+ return OrderType.ORDER_IN.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc)) {
+ return OrderType.ORDER_OUT.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.desc)) {
+ return OrderType.ORDER_OUT.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.desc)) {
+ return OrderType.ORDER_OUT.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.desc)) {
+ 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_STOCK_CHECK.desc)) {
+ return OrderType.ORDER_CHECK.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc)) {
+ return OrderType.ORDER_TRANSFER.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc)) {
+ return OrderType.ORDER_TRANSFER.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) {
+ return OrderType.ORDER_REVISE.type;
+ }
+ return null;
+ }
+
public static String getWorkDesc(String type) {
if (type.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc;
--
Gitblit v1.9.1