From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +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 | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 98148e4..ca2141f 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
@@ -14,8 +14,12 @@
ASN_EXCE_STATUS_EXCE_ING("1", "鎵ц涓�"),
ASN_EXCE_STATUS_TASK_DONE("2", "宸插畬鎴�"),
ASN_EXCE_STATUS_TASK_CANCEL("3", "鍙栨秷"),
- ASN_EXCE_STATUS_TASK_CLOSE("4", "宸插叧闂�")
- ;
+ ASN_EXCE_STATUS_TASK_CLOSE("4", "宸插叧闂�"),
+ OUT_STOCK_STATUS_TASK_INIT("5", "鍒濆鍖�"),
+ OUT_STOCK_STATUS_TASK_EXCE("6", "寰呭鐞�"),
+ OUT_STOCK_STATUS_TASK_WAVE("7", "鐢熸垚娉㈡"),
+ OUT_STOCK_STATUS_TASK_WORKING("8", "浣滀笟涓�")
+ ;
AsnExceStatus(String val, String desc) {
this.val = Short.parseShort(val);
this.desc = desc;
@@ -24,4 +28,44 @@
public Short val;
public String desc;
+ public static String getExceStatus(Short val) {
+ if (val.equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.desc;
+ } else if (val.equals(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.desc;
+ } else if (val.equals(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.desc;
+ } else if (val.equals(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.desc;
+ } else if (val.equals(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.desc;
+ } else if (val.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
+ 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 {
+ return null;
+ }
+ }
+
+ public static Short getExcelStatusDesc(String desc) {
+ if (desc.equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.desc)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val;
+ } else if (desc.equals(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.desc)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val;
+ } else if (desc.equals(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.desc)) {
+ return AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val;
+ } else if (desc.equals(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.desc)) {
+ 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)) {
+ 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 {
+ return null;
+ }
+ }
+
}
--
Gitblit v1.9.1