From 91d0af7ca0bb326e4cd68b085e7df0ffa073c986 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 07 十一月 2025 13:17:01 +0800
Subject: [PATCH] 兼容C3调拔入库功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 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 405ef34..8ccb1bf 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
@@ -14,9 +14,13 @@
ORDER_WORK_TYPE_PURCHASE("3", "棰嗘枡閫�鍥炲叆搴撳崟"),
ORDER_WORK_TYPE_SALE("4", "閿�鍞��鍥炲叆搴撳崟"),
ORDER_WORK_TYPE_OTHER_IN("5", "鍏跺畠鍏ュ簱鍗�"),
- ORDER_WORK_TYPE_OTHER_TERANSFER("6", "璋冩嫈鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_OTHER_TERANSFER_IN("6", "璋冩嫈鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_OTHER_TERANSFER("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", "鐩樼偣鍑哄簱"),
@@ -55,10 +59,53 @@
return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc)) {
return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc)) {
return OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc)) {
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;
+ }
+ 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;
}
@@ -78,7 +125,7 @@
return OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc;
} 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)) {
+ } 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;
@@ -88,8 +135,12 @@
return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
return OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc;
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
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;
}
return null;
}
--
Gitblit v1.9.1