From 11ff4d231e12aa7f7cd2627df5f79b6d2bed5906 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 21 六月 2024 16:17:29 +0800
Subject: [PATCH] 车轮参数信息添加、修改增加条件判断
---
代码管理/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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..80b8a1f 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,30 @@
/// <summary>
/// 绌鸿揣浣�
/// </summary>
-<<<<<<< Updated upstream
- Empty
-=======
Empty,
- Busy
->>>>>>> Stashed changes
+ /// <summary>
+ /// 鍗犵敤
+ /// </summary>
+ Busy,
+ /// <summary>
+ /// 鍏ュ簱鍗犵敤
+ /// </summary>
+ InBusy,
+ /// <summary>
+ /// 鍑哄簱鍗犵敤
+ /// </summary>
+ OutBusy,
+ /// <summary>
+ /// 寮傚父
+ /// </summary>
+ Abnormal,
+ /// <summary>
+ /// 妗佹灦涓嬫枡
+ /// </summary>
+ Load,
+ /// <summary>
+ /// 鎵樼洏鍒囨崲
+ /// </summary>
+ Trayswitching
}
}
--
Gitblit v1.9.3