From 687ed48ddc763e5674eb34b7f4e4227c30e2d384 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期六, 18 四月 2026 15:11:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

---
 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotSocketState.cs |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotSocketState.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotSocketState.cs
index 60844dc..66f25b9 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotSocketState.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotSocketState.cs
@@ -173,5 +173,53 @@
         /// 褰撹揪鍒� MaxTaskTotalNum (48) 鏃讹紝涓嶅啀涓嬪彂鏂颁换鍔°��
         /// </remarks>
         public int RobotTaskTotalNum { get; set; }
+
+        /// <summary>
+        /// 鏄惁澶勪簬鍋囩數鑺ˉ鍏呮ā寮�
+        /// </summary>
+        /// <remarks>
+        /// 褰撴甯哥數鑺换鍔″畬鎴愬悗璁句负 true锛屾満鍣ㄤ汉浠庡亣鐢佃姱浣嶇疆琛ュ厖鐢佃姱鑷�48涓��
+        /// </remarks>
+        public bool IsInFakeBatteryMode { get; set; }
+
+        /// <summary>
+        /// 褰撳墠鎵规璧峰缂栧彿锛堢敤浜庨�掑璁$畻鍙栬揣/鏀捐揣缂栧彿锛�
+        /// </summary>
+        /// <remarks>
+        /// 鍦ㄦ壒娆℃ā寮忎笅锛屾瘡鎵瑰彇璐�/鏀捐揣鐨勮捣濮嬬紪鍙蜂粠1寮�濮嬮�掑銆�
+        /// 鐢ㄤ簬璁$畻 {start}-{end} 鏍煎紡涓殑 start 鍊笺��
+        /// </remarks>
+        public int CurrentBatchIndex { get; set; } = 1;
+
+        /// <summary>
+        /// 鎹㈢洏浠诲姟褰撳墠闃舵
+        /// </summary>
+        /// <remarks>
+        /// 闃舵瀹氫箟锛�
+        /// 0: 鏈紑濮�
+        /// 1: 鍙栨甯哥數鑺紙娴佸悜B锛� / 鍙栧亣鐢佃姱锛堟祦鍚慉锛�
+        /// 2: 鏀炬甯哥數鑺紙娴佸悜B锛� / 鏀惧亣鐢佃姱锛堟祦鍚慉锛�
+        /// 3: 鍙栧亣鐢佃姱锛堟祦鍚態 Phase2锛�
+        /// 4: 鏀惧亣鐢佃姱鍒�5鍙蜂綅锛堟祦鍚態 Phase2锛�
+        /// </remarks>
+        public int ChangePalletPhase { get; set; }
+
+        /// <summary>
+        /// 鏄惁鎵爜NG
+        /// </summary>
+        /// <remarks>
+        /// 鎷夊甫绾夸笂鐢佃姱鎵爜鏄惁NG銆�
+        /// </remarks>
+        public bool IsScanNG { get; set; } = false;
+
+
+
+        /// <summary>
+        /// 鏄惁鐢佃姱鍒颁綅
+        /// </summary>
+        /// <remarks>
+        /// 鎷夊甫绾夸笂鐢佃姱鏄惁鍒颁綅銆�
+        /// </remarks>
+        public bool BatteryArrived { get; set; } = false;
     }
 }

--
Gitblit v1.9.3