From 18d1f45193e34e00fc1b6f65b8596ddb29c5267d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 24 十二月 2024 15:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs"
index e010eea..dd54520 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs"
@@ -24,21 +24,27 @@
         Lock = 1,
 
         /// <summary>
+        /// 鏈夎揣閿佸畾
+        /// </summary>
+        [Description("鏈夎揣閿佸畾")]
+        InStockLock = 10,
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Description("绌洪棽閿佸畾")]
+        FreeLock = 20,
+
+        /// <summary>
         /// 鏈夎揣
         /// </summary>
         [Description("鏈夎揣")]
-        InStock = 2,
+        InStock = 100,
 
         /// <summary>
-        /// 绌烘墭閿佸畾
+        /// 澶ф墭鐩橀攣瀹�
         /// </summary>
-        [Description("绌烘墭閿佸畾")]
-        PalletLock = 98,
-
-        /// <summary>
-        /// 绌烘墭鐩�
-        /// </summary>
-        [Description("绌烘墭鐩�")]
-        Pallet = 99
+        [Description("澶ф墭鐩橀攣瀹�")]
+        PalletLock = 99
     }
 }

--
Gitblit v1.9.3