From d8d34b1eda59c88f8de91d889165f63132a29499 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 16:48:45 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 2f6b32b..69a46ce 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
@@ -13,7 +13,7 @@
ORDER_WORK_TYPE_PROD("2", "鐢熶骇鍏ュ簱鍗�"),
ORDER_WORK_TYPE_PURCHASE("3", "棰嗘枡閫�鍥炲叆搴撳崟"),
ORDER_WORK_TYPE_SALE("4", "閿�鍞��鍥炲叆搴撳崟"),
- ORDER_WORK_TYPE_RETURN("5", "鍏跺畠鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_OTHER_IN("5", "鍏跺畠鍏ュ簱鍗�"),
ORDER_WORK_TYPE_SUPPLIER("11", "閿�鍞嚭搴撳崟"),
ORDER_WORK_TYPE_RETURN_ORDER("12", "棰嗘枡鍑哄簱鍗�"),
ORDER_WORK_TYPE_PURCHASE_RETURN("13", "閲囪喘閫�鍥炲嚭搴撳崟"),
@@ -37,8 +37,8 @@
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_OTHER_IN.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.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)) {
@@ -60,8 +60,8 @@
return OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.type)) {
return OrderWorkType.ORDER_WORK_TYPE_SALE.desc;
- } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN.type)) {
- return OrderWorkType.ORDER_WORK_TYPE_RETURN.desc;
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.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)) {
--
Gitblit v1.9.1