From b21ca070526ec10fbea98e29135751776dc31059 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 10:09:47 +0800
Subject: [PATCH] 增加一种入库单类型
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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 6ff6f2f..f85f1d6 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
@@ -11,8 +11,11 @@
//璁㈠崟绫诲瀷
ORDER_WORK_TYPE_DONE_IN("1", "閲囪喘鍏ュ簱鍗�"),
ORDER_WORK_TYPE_PROD("2", "鐢熶骇鍏ュ簱鍗�"),
+ /** ERP 鍗曞埆锛岀敓浜у叆搴擄紙鍏ュ簱绫伙級 */
+ ORDER_WORK_TYPE_PROD_B017("B017", "鐢熶骇鍏ュ簱"),
ORDER_WORK_TYPE_PURCHASE("3", "棰嗘枡閫�鍥炲叆搴撳崟"),
ORDER_WORK_TYPE_SALE("4", "閿�鍞��鍥炲叆搴撳崟"),
+ ORDER_WORK_TYPE_SALES_RETURN_D004("D004", "閿�鍞��璐�"),
ORDER_WORK_TYPE_OTHER_IN("5", "鍏跺畠鍏ュ簱鍗�"),
ORDER_WORK_TYPE_OTHER_TERANSFER_IN("6", "璋冩嫈鍏ュ簱鍗�"),
ORDER_WORK_TYPE_OTHER_TERANSFER("8", "璋冩嫈鍏ュ簱鍗�"),//椤圭洰涓存椂淇敼
@@ -41,10 +44,18 @@
return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.desc)) {
return OrderWorkType.ORDER_WORK_TYPE_PROD.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type;
+ } else if (desc.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc)) {
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.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.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)) {
@@ -82,9 +93,17 @@
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_PROD_B017.desc)) {
+ return OrderType.ORDER_IN.type;
+ } else if (desc.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type)) {
+ 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.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type)) {
+ return OrderType.ORDER_IN.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.desc)) {
return OrderType.ORDER_IN.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.desc)) {
return OrderType.ORDER_IN.type;
@@ -115,10 +134,14 @@
return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
return OrderWorkType.ORDER_WORK_TYPE_PROD.desc;
+ } else if (type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_PROD_B017.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
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.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.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)) {
@@ -144,6 +167,5 @@
}
return null;
}
-
}
--
Gitblit v1.9.1