From b690250002ee04f4309e6a90fd16fbfd9bd959e2 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 01 五月 2026 23:11:23 +0800
Subject: [PATCH] feat(router): 添加托盘操作页面路由

---
 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs |  286 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 228 insertions(+), 58 deletions(-)

diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
index cc354d5..4da6e19 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
@@ -1,5 +1,6 @@
+using Serilog;
 using WIDESEAWCS_Common.TaskEnum;
-using WIDESEAWCS_Core.LogHelper;
+using WIDESEAWCS_Model.Models;
 using WIDESEAWCS_Tasks.Workflow.Abstractions;
 
 namespace WIDESEAWCS_Tasks.Workflow
@@ -35,13 +36,29 @@
         private readonly ISocketClientGateway _socketClientGateway;
 
         /// <summary>
+        /// 鏃ュ織璁板綍鍣�
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// 鏈烘鎵嬬姸鎬佺鐞嗗櫒
+        /// </summary>
+        /// <remarks>
+        /// 鐢ㄤ簬璇诲彇鍜屾洿鏂版満鍣ㄤ汉鐨勭姸鎬併��
+        /// </remarks>
+        private readonly RobotStateManager _stateManager;
+
+        /// <summary>
         /// 鏋勯�犲嚱鏁�
         /// </summary>
         /// <param name="taskProcessor">浠诲姟澶勭悊鍣ㄥ疄渚�</param>
-        public RobotSimpleCommandHandler(RobotTaskProcessor taskProcessor, ISocketClientGateway socketClientGateway)
+        /// <param name="logger">鏃ュ織璁板綍鍣�</param>
+        public RobotSimpleCommandHandler(RobotTaskProcessor taskProcessor, ISocketClientGateway socketClientGateway, ILogger logger, RobotStateManager stateManager)
         {
             _taskProcessor = taskProcessor;
             _socketClientGateway = socketClientGateway;
+            _logger = logger;
+            _stateManager = stateManager;
         }
 
         /// <summary>
@@ -87,7 +104,21 @@
                 // 鏈哄櫒浜哄凡瀹屾垚鍥為浂
                 case "homed":
                     state.Homed = "Homed";
-                    return true;
+
+                    if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                    {
+                        for (int i = 0; i < 5; i++)
+                        {
+                            QuartzLogHelper.LogDebug(_logger, $"鍙戦�佸洖闆跺畬鎴愭秷鎭紝IP: {state.IPAddress}锛屾鍦ㄩ噸璇�...", state.RobotCrane?.DeviceName ?? "Unknown");
+                            await _socketClientGateway.SendToClientAsync(state.IPAddress, "Homed");
+                        }
+                        return true;
+                    }
+                    else
+                    {
+                        QuartzLogHelper.LogError(_logger, $"鍙戦�佸洖闆跺畬鎴愭秷鎭け璐ワ紝IP: {state.IPAddress}", state.RobotCrane?.DeviceName ?? "Unknown");
+                        return false;
+                    }
 
                 // 鏈哄櫒浜烘鍦ㄨ繍琛�
                 case "running":
@@ -119,10 +150,88 @@
                     state.CurrentAction = "Putting";
                     return true;
 
-                // 鎵嬭噦鏃犵墿鏂欙紙鎵嬭噦绌洪棽锛�
+                // 鏄惁鐢佃姱鍒颁綅
                 case "batteryarrived":
                     state.BatteryArrived = true;
-                    return true;
+
+                    if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                    {
+                        for (int i = 0; i < 5; i++)
+                        {
+                            QuartzLogHelper.LogDebug(_logger, $"鍙戦�佺數鑺埌浣嶆秷鎭紝IP: {state.IPAddress}锛屾鍦ㄩ噸璇�...", state.RobotCrane?.DeviceName ?? "Unknown");
+                            await _socketClientGateway.SendToClientAsync(state.IPAddress, "batteryarrived");
+                        }
+                        return true;
+                    }
+                    else
+                    {
+                        QuartzLogHelper.LogError(_logger, $"鍙戦�佺數鑺湭鍒颁綅娑堟伅澶辫触锛孖P: {state.IPAddress}", state.RobotCrane?.DeviceName ?? "Unknown");
+                        return false;
+                    }
+
+                // 鏄惁鐢佃姱娌″埌浣�
+                case "batteryarrivedno":
+                    state.BatteryArrived = false;
+
+                    if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                    {
+                        for (int i = 0; i < 5; i++)
+                        {
+                            QuartzLogHelper.LogDebug(_logger, $"鍙戦�佺數鑺湭鍒颁綅娑堟伅锛孖P: {state.IPAddress}锛屾鍦ㄩ噸璇�...", state.RobotCrane?.DeviceName ?? "Unknown");
+                            await _socketClientGateway.SendToClientAsync(state.IPAddress, "batteryarrivedno");
+                        }
+
+                        return true;
+                    }
+                    else
+                    {
+                        QuartzLogHelper.LogError(_logger, $"鍙戦�佺數鑺湭鍒颁綅娑堟伅澶辫触锛孖P: {state.IPAddress}", state.RobotCrane?.DeviceName ?? "Unknown");
+                        return false;
+                    }
+
+                // ==================== 鎺ユ敹浠诲姟鍙嶉 ====================
+
+                // 鍙栬揣鎺ユ敹
+                case "pickbatteryover":
+                    var isResult = UpdateStatus(state, true);
+                    if (!isResult)
+                        return false;
+
+                    if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                    {
+                        for (int i = 0; i < 5; i++)
+                        {
+                            QuartzLogHelper.LogDebug(_logger, $"鍙戦�佸彇璐ф帴鏀跺畬鎴愶紝IP: {state.IPAddress}锛屾鍦ㄩ噸璇�...", state.RobotCrane?.DeviceName ?? "Unknown");
+                            await _socketClientGateway.SendToClientAsync(state.IPAddress, "pickbatteryover");
+                        }
+                        return true;
+                    }
+                    else
+                    {
+                        QuartzLogHelper.LogError(_logger, $"鍙戦�佸彇璐у畬鎴愭秷鎭け璐ワ紝IP: {state.IPAddress}", state.RobotCrane?.DeviceName ?? "Unknown");
+                        return false;
+                    }
+
+                // 鏀捐揣鎺ユ敹
+                case "putbatteryover":
+                    isResult = UpdateStatus(state, false);
+                    if (!isResult)
+                        return false;
+
+                    if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                    {
+                        for (int i = 0; i < 5; i++)
+                        {
+                            QuartzLogHelper.LogDebug(_logger, $"鍙戦�佹斁璐ф帴鏀舵秷鎭紝IP: {state.IPAddress}锛屾鍦ㄩ噸璇�...", state.RobotCrane?.DeviceName ?? "Unknown");
+                            await _socketClientGateway.SendToClientAsync(state.IPAddress, "putbatteryover");
+                        }
+                        return true;
+                    }
+                    else
+                    {
+                        QuartzLogHelper.LogError(_logger, $"鍙戦�佹斁璐у畬鎴愭秷鎭け璐ワ紝IP: {state.IPAddress}", state.RobotCrane?.DeviceName ?? "Unknown");
+                        return false;
+                    }
 
                 // ==================== 鍏ㄩ儴瀹屾垚鍛戒护 ====================
 
@@ -146,70 +255,77 @@
                         // 鎹㈢洏浠诲姟锛氭牴鎹樁娈靛尯鍒嗗鐞�
                         if (robotTaskType == RobotTaskTypeEnum.ChangePallet)
                         {
-                            // 璋冪敤鎵归噺鎷嗙洏纭鎺ュ彛
-                            var sourcePallet = state.CurrentTask.RobotSourceAddressPalletCode;
-                            var confirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet, state.RobotCrane?.DeviceName);
-                            if (!confirmResult.IsSuccess)
-                            {
-                                QuartzLogger.Error($"鎵归噺鎷嗙洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
-                                return false;
-                            }
-
                             if (state.ChangePalletPhase == 5)
                             {
                                 // FlowB 鏈�缁堥樁娈碉細鍋囩數鑺彇瀹岋紝婧愮┖鎵樼洏鍥炲簱 HCSC1
-                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: "HCSC1"))
                                 {
                                     return false;
                                 }
 
                                 if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                                 {
-                                    QuartzLogger.Error($"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                    QuartzLogHelper.LogError(_logger, $"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                     return false;
                                 }
 
-                                await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
-                                QuartzLogger.Info($"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
-
                                 state.CurrentTask = null;
+                                state.CurrentTaskNum = null;
                                 state.RobotTaskTotalNum = 0;
                                 state.CellBarcode = new List<string>();
+                                state.CurrentBatchBarcodes = new List<string>();
                                 state.ChangePalletPhase = 0;
                                 state.CurrentBatchIndex = 1;
                                 state.IsInFakeBatteryMode = false;
-                                return true;
+
+                                if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                                {
+                                    await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+                                    QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
+                                    return true;
+                                }
+                                else
+                                {
+                                    return false;
+                                }
                             }
                             else if (state.ChangePalletPhase != 0)
                             {
                                 // FlowA 涓棿闃舵锛氭甯哥數鑺彇瀹岋紝婧愮┖鎵樼洏鍥炲簱 GWSC1
                                 // 涓嶅垹闄や换鍔★紝涓嶉噸缃姸鎬侊紝缁х画 Phase 3-4 鍋囩數鑺祦绋�
-                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: "GWSC1"))
                                 {
                                     return false;
                                 }
                                 return true;
                             }
 
+                            List<string> str = new List<string>() { "11001", "11010" };
                             // Phase == 0: 闈炴壒娆℃ā寮忥紙鐩爣鎬绘暟==48锛�
-                            if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+                            if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: str.Contains(currentTask.RobotSourceAddressLineCode) ? "GWSC1" : "HCSC1"))
                             {
                                 return false;
                             }
 
-                            if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
-                            {
-                                QuartzLogger.Error($"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
-                                return false;
-                            }
-
-                            await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
-                            QuartzLogger.Info($"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+                            //if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
+                            //{
+                            //    QuartzLogHelper.LogError(_logger, $"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+                            //    return false;
+                            //}
 
                             state.ChangePalletPhase = 0;
                             state.CurrentBatchIndex = 1;
                             state.IsInFakeBatteryMode = false;
-                            return true;
+                            if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                            {
+                                await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+                                QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
+                                return true;
+                            }
+                            else
+                            {
+                                return false;
+                            }
                         }
 
                         // 鎷嗙洏浠诲姟锛氱洿鎺ュ鐞嗗叆搴�
@@ -220,7 +336,7 @@
                             var confirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet, state.RobotCrane?.DeviceName);
                             if (!confirmResult.IsSuccess)
                             {
-                                QuartzLogger.Error($"鎵归噺鎷嗙洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                QuartzLogHelper.LogError(_logger, $"鎵归噺鎷嗙洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                 return false;
                             }
 
@@ -232,13 +348,20 @@
                             // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
                             if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                             {
-                                QuartzLogger.Error($"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                QuartzLogHelper.LogError(_logger, $"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                 return false;
                             }
 
-                            await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
-                            QuartzLogger.Info($"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
-                            return true;
+                            if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                            {
+                                await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+                                QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
+                                return true;
+                            }
+                            else
+                            {
+                                return false;
+                            }
                         }
                         return false;
                     }
@@ -262,75 +385,101 @@
                         // 鎹㈢洏浠诲姟锛氭牴鎹樁娈靛尯鍒嗗鐞�
                         if (robotTaskType == RobotTaskTypeEnum.ChangePallet)
                         {
+                            // 璋冪敤鎵归噺鎷嗙洏纭鎺ュ彛
+                            var sourcePallet = state.CurrentTask.RobotSourceAddressPalletCode;
+                            var splitConfirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet, state.RobotCrane?.DeviceName);
+                            if (!splitConfirmResult.IsSuccess && !splitConfirmResult.Data.Status)
+                            {
+                                QuartzLogHelper.LogError(_logger, $"鎵归噺鎷嗙洏纭澶辫触: {splitConfirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                return false;
+                            }
+
                             // 璋冪敤鎵归噺缁勭洏纭鎺ュ彛
                             var targetPallet = state.CurrentTask.RobotTargetAddressPalletCode;
                             var confirmResult = _taskProcessor.PostGroupPalletConfirmAsync(targetPallet, state.RobotCrane?.DeviceName);
-                            if (!confirmResult.IsSuccess)
+                            if (!confirmResult.IsSuccess && !confirmResult.Data.Status)
                             {
-                                QuartzLogger.Error($"鎵归噺缁勭洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                QuartzLogHelper.LogError(_logger, $"鎵归噺缁勭洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                 return false;
                             }
 
                             if (state.ChangePalletPhase == 5)
                             {
                                 // FlowA 鏈�缁堥樁娈碉細鍋囩數鑺斁瀹岋紝鐩爣鎵樼洏婊�48鍏ュ簱 HCSC1
-                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
+                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, isRoadway: "HCSC1"))
                                 {
                                     return false;
                                 }
 
                                 if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                                 {
-                                    QuartzLogger.Error($"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                    QuartzLogHelper.LogError(_logger, $"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                     return false;
                                 }
 
                                 state.CurrentTask = null;
+                                state.CurrentTaskNum = null;
                                 state.RobotTaskTotalNum = 0;
                                 state.CellBarcode = new List<string>();
-
-                                await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
-                                QuartzLogger.Info($"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
-
+                                state.CurrentBatchBarcodes = new List<string>();
                                 state.ChangePalletPhase = 0;
                                 state.CurrentBatchIndex = 1;
                                 state.IsInFakeBatteryMode = false;
-                                return true;
+
+                                if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                                {
+                                    await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+                                    QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
+                                    return true;
+                                }
+                                else
+                                {
+                                    return false;
+                                }
                             }
                             else if (state.ChangePalletPhase != 0)
                             {
                                 // FlowB 涓棿闃舵锛氭甯哥數鑺斁瀹岋紝鏈夎揣鎵樼洏缁勭洏鍏ュ簱 GWSC1
                                 // 涓嶅垹闄や换鍔★紝涓嶉噸缃姸鎬侊紝缁х画 Phase 3-4 鍋囩數鑺祦绋�
-                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
+                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, isRoadway: "GWSC1"))
                                 {
                                     return false;
                                 }
                                 return true;
                             }
 
+                            List<string> str = new List<string>() { "11001", "11010" };
                             // Phase == 0: 闈炴壒娆℃ā寮忥紙鐩爣鎬绘暟==48锛�
-                            if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
+                            if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, str.Contains(currentTask.RobotTargetAddressLineCode) ? "GWSC1" : "HCSC1"))
                             {
                                 return false;
                             }
 
                             if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                             {
-                                QuartzLogger.Error($"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                QuartzLogHelper.LogError(_logger, $"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                 return false;
                             }
 
                             state.CurrentTask = null;
+                            state.CurrentTaskNum = null;
                             state.RobotTaskTotalNum = 0;
                             state.CellBarcode = new List<string>();
-
-                            await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
-                            QuartzLogger.Info($"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
-
+                            state.CurrentBatchBarcodes = new List<string>();
                             state.ChangePalletPhase = 0;
                             state.CurrentBatchIndex = 1;
                             state.IsInFakeBatteryMode = false;
-                            return true;
+
+                            if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                            {
+                                await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+                                QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
+                                return true;
+                            }
+                            else
+                            {
+                                return false;
+                            }
                         }
 
                         // 缁勭洏浠诲姟锛氱洿鎺ュ鐞嗗叆搴�
@@ -341,7 +490,7 @@
                             var confirmResult = _taskProcessor.PostGroupPalletConfirmAsync(targetPallet, state.RobotCrane?.DeviceName);
                             if (!confirmResult.IsSuccess)
                             {
-                                QuartzLogger.Error($"鎵归噺缁勭洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                QuartzLogHelper.LogError(_logger, $"鎵归噺缁勭洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                 return false;
                             }
 
@@ -355,18 +504,27 @@
                             // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
                             if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                             {
-                                QuartzLogger.Error($"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+                                QuartzLogHelper.LogError(_logger, $"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                 return false;
                             }
 
                             // 娓呯悊鐘舵�侊紝涓轰笅涓�涓换鍔″仛鍑嗗
                             state.CurrentTask = null;           // 娓呴櫎褰撳墠浠诲姟
+                            state.CurrentTaskNum = null;        // 娓呴櫎褰撳墠浠诲姟缂栧彿
                             state.RobotTaskTotalNum = 0;        // 閲嶇疆浠诲姟璁℃暟
                             state.CellBarcode = new List<string>();  // 娓呯┖鏉$爜鍒楄〃
+                            state.CurrentBatchBarcodes = new List<string>();  // 娓呯┖褰撳墠鎵规鏉$爜
 
-                            await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
-                            QuartzLogger.Info($"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
-                            return true;
+                            if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
+                            {
+                                await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+                                QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
+                                return true;
+                            }
+                            else
+                            {
+                                return false;
+                            }
                         }
                         return false;
                     }
@@ -412,5 +570,17 @@
                     return false;
             }
         }
+
+        public bool UpdateStatus(RobotSocketState state, bool isPick)
+        {
+            var task = _taskProcessor.GetRobotTask(state?.RobotCrane);
+            if (task == null)
+            {
+                QuartzLogHelper.LogError(_logger, $"鍙栬揣鎺ユ敹澶辫触: 鏈壘鍒般�恵state?.RobotCrane}銆戠殑浠诲姟", state.RobotCrane?.DeviceName ?? "Unknown");
+                return false;
+            }
+            task.RobotTaskState = (int)TaskRobotStatusEnum.RobotExecuting;
+            return _taskProcessor.UpdateRobotTask(task);
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3