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/AsnExceStatus.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java
index c58518d..e65d7ce 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java
@@ -9,18 +9,25 @@
*/
public enum AsnExceStatus {
- //璐ㄦ鐘舵��
+ //ASN鎵ц鐘舵�佺姸鎬�
ASN_EXCE_STATUS_UN_EXCE("0", "鏈墽琛�"),
ASN_EXCE_STATUS_EXCE_ING("1", "鎵ц涓�"),
- ASN_EXCE_STATUS_TASK_DONE("2", "宸插畬鎴�"),
- ASN_EXCE_STATUS_TASK_CANCEL("3", "鍙栨秷"),
- ASN_EXCE_STATUS_TASK_CLOSE("4", "宸插叧闂�"),
- OUT_STOCK_STATUS_TASK_INIT("5", "鍒濆鍖�"),
- OUT_STOCK_STATUS_TASK_EXCE("6", "寰呭鐞�"),
+ ASN_EXCE_STATUS_RECEIPT_DONE("2", "鏀惰揣瀹屾垚"),
+ ASN_EXCE_STATUS_TASK_DONE("3", "宸插畬鎴�"),
+ ASN_EXCE_STATUS_TASK_CANCEL("4", "鍙栨秷"),
+ ASN_EXCE_STATUS_TASK_CLOSE("5", "宸插叧闂�"),
- OUT_STOCK_STATUS_TASK_WAVE("7", "鐢熸垚娉㈡"),
+ //PO鍗曟墽琛岀姸鎬�
+// PO_EXCE_STATUS_UN_EXCE("0", "鏈墽琛�"),
+// PO_EXCE_STATUS_EXCE_ING("1", "鎵ц涓�"),
+// PO_EXCE_STATUS_SECTION_DONE("2", "閮ㄥ垎瀹屾垚"),
+// PO_EXCE_STATUS_ALL_DONE("3", "宸插畬鎴�"),
- OUT_STOCK_STATUS_TASK_WORKING("8", "浣滀笟涓�")
+
+ OUT_STOCK_STATUS_TASK_INIT("11", "鍒濆鍖�"),
+ OUT_STOCK_STATUS_TASK_EXCE("12", "寰呭鐞�"),
+ OUT_STOCK_STATUS_TASK_WAVE("13", "鐢熸垚娉㈡"),
+ OUT_STOCK_STATUS_TASK_WORKING("14", "浣滀笟涓�")
;
AsnExceStatus(String val, String desc) {
this.val = Short.parseShort(val);
@@ -45,6 +52,8 @@
return AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.desc;
} else if (val.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.val)) {
return AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.desc;
+ } else if (val.equals(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.desc;
} else {
return null;
}
@@ -61,10 +70,12 @@
return AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val;
} else if (desc.equals(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.desc)) {
return AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val;
- }else if (desc.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.desc)) {
+ } else if (desc.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.desc)) {
return AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val;
} else if (desc.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.desc)) {
return AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.val;
+ } else if (desc.equals(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.desc)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val;
} else {
return null;
}
--
Gitblit v1.9.1