From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java
index 3efe1c5..15d38b7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java
@@ -12,11 +12,12 @@
INIT(0, "鍒濆鍖�"),
WAIT(1, "寰呭鐞�"),
- WORKING(2, "浣滀笟涓�"),
- CANCEL(3, "宸插彇娑�"),
- COMPLETE(4, "宸插畬鎴�"),
- WAIT_CANCEL(5, "鍑嗗鍙栨秷"),
- REPORT_COMPLETE(6, "涓婃姤瀹屾垚"),
+ WAVE(2, "娉㈡鐢熸垚"),
+ WORKING(3, "浣滀笟涓�"),
+ CANCEL(4, "宸插彇娑�"),
+ COMPLETE(5, "宸插畬鎴�"),
+ WAIT_CANCEL(6, "鍑嗗鍙栨秷"),
+ REPORT_COMPLETE(7, "涓婃姤瀹屾垚"),
;
--
Gitblit v1.9.1