From 46f7bf1ee45c97b688a370bbe45d149efb403cc1 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 07 五月 2024 17:26:18 +0800
Subject: [PATCH] 检测上料逻辑修改,无有料货位时写入不允许桁架进入信号

---
 代码管理/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
index 6f0e255..2e3dab7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
@@ -15,11 +15,22 @@
         /// <summary>
         /// 绌鸿揣浣�
         /// </summary>
-<<<<<<< Updated upstream
-        Empty
-=======
         Empty,
-        Busy
->>>>>>> Stashed changes
+        /// <summary>
+        /// 鍗犵敤
+        /// </summary>
+        Busy,
+        /// <summary>
+        /// 鍏ュ簱鍗犵敤
+        /// </summary>
+        InBusy,
+        /// <summary>
+        /// 鍑哄簱鍗犵敤
+        /// </summary>
+        OutBusy,
+        /// <summary>
+        /// 寮傚父
+        /// </summary>
+        Abnormal
     }
 }

--
Gitblit v1.9.3