From 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 29 十二月 2025 14:36:08 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs"
index 67446d8..f1c8b7e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs"
@@ -13,33 +13,39 @@
     public enum LocationTypeEnum
     {
         /// <summary>
-        /// 鏈畾涔�
+        /// 姝e父鐗╂枡鍖�
         /// </summary>
-        [Description("鏈畾涔�")]
-        Undefined = 0,
+        [Description("姝e父鐗╂枡鍖�")]
+        Normal = 0,
 
         /// <summary>
-        /// 灏忔墭鐩�
+        /// -鑸潗鏂欏尯
         /// </summary>
-        [Description("灏忔墭鐩�")]
-        SmallPallet = 1,
+        [Description("鏅轰粨--鑸潗鏂欎粨")]
+        Ordinary = 1,
 
         /// <summary>
-        /// 涓墭鐩�
+        /// 涓嶈壇鍝佸尯
         /// </summary>
-        [Description("涓墭鐩�")]
-        MediumPallet = 2,
-
+        [Description("鏅轰粨-涓嶈壇鍝佷粨")]
+        Defective = 2,
         /// <summary>
-        /// 澶ф墭鐩�
+        /// PCBA鍖�
         /// </summary>
-        [Description("澶ф墭鐩�")]
-        LargePallet = 3,
+        [Description("鏅轰粨-鐢靛瓙浠�")]
+        Electronic = 3,
 
-        /// <summary>
-        /// 鐗瑰ぇ鎵樼洏
+        /// <summary> 
+        /// 淇濈◣鍖�
         /// </summary>
-        [Description("鐗瑰ぇ鎵樼洏")]
-        ExtraPallet = 4,
+        [Description("鏅轰粨-淇濈◣鏉愭枡浠�")]
+        Bonded = 4,
+
+        [Description("鏅轰粨-鍖呮潗浠�")]
+        Package = 5,
+
+        [Description("鏅轰粨-璇曚骇浠�")]
+        TrialProduction = 6,
+
     }
 }

--
Gitblit v1.9.3