From 5c6e99cb3b30e0b4127caa3b626c2b51ea038b61 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期日, 26 四月 2026 17:49:27 +0800
Subject: [PATCH] Merge branch 'dev' into xiaoyang

---
 Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs
index 65ea267..4a3a486 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs
@@ -56,10 +56,23 @@
         [Description("閫�搴�")]
         MES閫�搴� = 21,
 
+        [Description("绌烘墭鐩樺簱瀛�")]
+        绌烘墭鐩樺簱瀛� = 22,
+
         [Description("缁勭洏鎾ら攢")]
         缁勭洏鎾ら攢 = 99,
 
         [Description("鍏ュ簱鎾ら攢")]
         鍏ュ簱鎾ら攢 = 199,
+    }
+    /// <summary>
+    /// 鎵樼洏绫诲瀷
+    /// </summary>
+    public enum PalletTypesEmun
+    {
+        [Description("妯″垏娈�")]
+        妯″垏娈� = 1,
+        [Description("鍗风粫娈�")]
+        鍗风粫娈� = 2,
     }
 }

--
Gitblit v1.9.3