From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 37cac19..f3e67f5 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
@@ -13,9 +13,10 @@
ASN_EXCE_STATUS_UN_EXCE("0", "鏈墽琛�"),
ASN_EXCE_STATUS_EXCE_ING("1", "鎵ц涓�"),
ASN_EXCE_STATUS_RECEIPT_DONE("2", "鏀惰揣瀹屾垚"),
- ASN_EXCE_STATUS_TASK_DONE("3", "宸插畬鎴�"),
- ASN_EXCE_STATUS_TASK_CANCEL("4", "鍙栨秷"),
- ASN_EXCE_STATUS_TASK_CLOSE("5", "宸插叧闂�"),
+ ASN_EXCE_STATUS_TASK_EXCE("3", "浠诲姟鎵ц涓�"),
+ ASN_EXCE_STATUS_TASK_DONE("4", "宸插畬鎴�"),
+ ASN_EXCE_STATUS_TASK_CANCEL("8", "鍙栨秷"),
+ ASN_EXCE_STATUS_TASK_CLOSE("9", "宸插叧闂�"),
//PO鍗曟墽琛岀姸鎬�
// PO_EXCE_STATUS_UN_EXCE("0", "鏈墽琛�"),
@@ -26,8 +27,12 @@
OUT_STOCK_STATUS_TASK_INIT("10", "鍒濆鍖�"),
OUT_STOCK_STATUS_TASK_EXCE("11", "寰呭鐞�"),
- OUT_STOCK_STATUS_TASK_WAVE("12", "鐢熸垚娉㈡"),
- OUT_STOCK_STATUS_TASK_WORKING("13", "浣滀笟涓�")
+ OUT_STOCK_STATUS_TASK_WAVE("11", "鐢熸垚娉㈡"),
+ OUT_STOCK_STATUS_TASK_CREATE("13", "鐢熸垚宸ヤ綔妗�"),
+ OUT_STOCK_STATUS_TASK_WORKING("14", "浣滀笟涓�"),
+ OUT_STOCK_STATUS_TASK_DONE("15", "宸插畬鎴�")
+
+
;
AsnExceStatus(String val, String desc) {
this.val = Short.parseShort(val);
--
Gitblit v1.9.1