From d8cbfdcac8292522dd3c39e5cafdf19a43d15a5d Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 11:21:08 +0800
Subject: [PATCH] 强制组托单号必填
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 106 insertions(+), 3 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..fef2991 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,18 +11,35 @@
//璁㈠崟绫诲瀷
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("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", "鐩樼偣鍑哄簱"),
ORDER_WORK_TYPE_STOCK_TERANSFER("17", "璋冩嫈鍑哄簱鍗�"),
- ORDER_WORK_TYPE_OTHER("14", "鍏跺畠鍑哄簱鍗�");
+ ORDER_WORK_TYPE_OTHER("14", "鍏跺畠鍑哄簱鍗�"),
+
+ ORDER_WORK_TYPE_D001("D001", "閿�鍞嚭搴�"),
+ ORDER_WORK_TYPE_A008("A008", "閲囪喘浠撻��"),
+ /** ERP 鍚岀爜澶氬満鏅椂鍏辩敤 B003 */
+ ORDER_WORK_TYPE_B003_ERP("B003", "棰嗘枡鍑哄簱-宸ュ崟鍙戞枡/瓒呴"),
+ ORDER_WORK_TYPE_C036("C036", "鍊熷嚭-鍑哄簱"),
+ ORDER_WORK_TYPE_A005("A005", "閲囪喘鍏ュ簱"),
+ ORDER_WORK_TYPE_D022("D022", "閫�璐у叆搴�-宸ュ崟閫�鏂�"),
+ ORDER_WORK_TYPE_B042("B042", "鐢熶骇鍏ュ簱-宸ュ崟瓒呭叆"),
+ ORDER_WORK_TYPE_B007("B007", "鐢熶骇鍏ュ簱-鍏ュ簱涓婃灦"),
+ ORDER_WORK_TYPE_C037("C037", "璋冩嫧鍏ュ簱-鍊熷嚭褰掕繕");
OrderWorkType(String type, String desc) {
@@ -38,10 +55,22 @@
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 ("鐢熶骇鍏ュ簱".equals(desc)) {
+ 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 ("閿�鍞��璐�".equals(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)) {
@@ -56,14 +85,41 @@
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;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_D001)) {
+ return OrderWorkType.ORDER_WORK_TYPE_D001.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_A008)) {
+ return OrderWorkType.ORDER_WORK_TYPE_A008.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B003_ERP)) {
+ return OrderWorkType.ORDER_WORK_TYPE_B003_ERP.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_C036)) {
+ return OrderWorkType.ORDER_WORK_TYPE_C036.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_A005)) {
+ return OrderWorkType.ORDER_WORK_TYPE_A005.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_D022)) {
+ return OrderWorkType.ORDER_WORK_TYPE_D022.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B042)) {
+ return OrderWorkType.ORDER_WORK_TYPE_B042.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B007)) {
+ return OrderWorkType.ORDER_WORK_TYPE_B007.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_C037)) {
+ return OrderWorkType.ORDER_WORK_TYPE_C037.type;
}
return null;
+ }
+
+ private static boolean matchErpCode(String desc, OrderWorkType t) {
+ if (desc == null) {
+ return false;
+ }
+ return desc.equalsIgnoreCase(t.type) || desc.equals(t.desc);
}
/**
@@ -77,9 +133,15 @@
return OrderType.ORDER_IN.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.desc)) {
return OrderType.ORDER_IN.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_PROD_B017) || "鐢熶骇鍏ュ簱".equals(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.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;
@@ -101,6 +163,24 @@
return OrderType.ORDER_TRANSFER.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) {
return OrderType.ORDER_REVISE.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_D001)) {
+ return OrderType.ORDER_OUT.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_A008)) {
+ return OrderType.ORDER_OUT.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B003_ERP)) {
+ return OrderType.ORDER_OUT.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_C036)) {
+ return OrderType.ORDER_OUT.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_A005)) {
+ return OrderType.ORDER_IN.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_D022)) {
+ return OrderType.ORDER_IN.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B042)) {
+ return OrderType.ORDER_IN.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B007)) {
+ return OrderType.ORDER_IN.type;
+ } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_C037)) {
+ return OrderType.ORDER_IN.type;
}
return null;
}
@@ -110,10 +190,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)) {
@@ -130,13 +214,32 @@
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;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_D001.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_D001.desc;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_A008.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_A008.desc;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_B003_ERP.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_B003_ERP.desc;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_C036.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_C036.desc;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_A005.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_A005.desc;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_D022.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_D022.desc;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_B042.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_B042.desc;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_B007.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_B007.desc;
+ } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_C037.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_C037.desc;
}
return null;
}
-
}
--
Gitblit v1.9.1