From bf2aa9dd56432a74940ca1bb08fb4d7eaee37045 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 27 三月 2026 11:03:37 +0800
Subject: [PATCH] feat(WCS): 完善 WIDESEAWCS_Tasks 模块日志系统

---
 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotJob.cs |  711 ++++++++++++++++-------------------------------------------
 1 files changed, 193 insertions(+), 518 deletions(-)

diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotJob.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotJob.cs
index bd3d436..08ffb97 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotJob.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotJob.cs
@@ -1,574 +1,249 @@
-锘縰sing HslCommunication;
-using Newtonsoft.Json;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
+using Microsoft.Extensions.Logging;
 using Quartz;
 using System.Net;
-using System.Net.Sockets;
-using System.Threading.Tasks;
 using WIDESEA_Core;
-using WIDESEAWCS_Common;
-using WIDESEAWCS_Common.HttpEnum;
-using WIDESEAWCS_Common.TaskEnum;
-using WIDESEAWCS_Core;
 using WIDESEAWCS_Core.Caches;
 using WIDESEAWCS_Core.Helper;
-using WIDESEAWCS_DTO.Stock;
-using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_Core.LogHelper;
 using WIDESEAWCS_ITaskInfoService;
-using WIDESEAWCS_Model.Models;
 using WIDESEAWCS_QuartzJob;
 using WIDESEAWCS_Tasks.SocketServer;
+using WIDESEAWCS_Tasks.Workflow;
+using WIDESEAWCS_Tasks.Workflow.Abstractions;
 
 namespace WIDESEAWCS_Tasks
 {
+    /// <summary>
+    /// 鏈哄櫒浜轰换鍔′綔涓氾紙Quartz Job锛�- 璐熻矗璋冨害涓庣敓鍛藉懆鏈熺鐞�
+    /// </summary>
+    /// <remarks>
+    /// Quartz 瀹氭椂浠诲姟锛屾瘡绉掓墽琛屼竴娆★紙榛樿锛夛紝涓昏鑱岃矗锛�
+    /// 1. 浠� JobDataMap 鑾峰彇璁惧淇℃伅
+    /// 2. 纭繚 TCP 瀹㈡埛绔凡杩炴帴骞惰闃呮秷鎭�
+    /// 3. 杞寰呭鐞嗙殑鏈哄櫒浜轰换鍔�
+    /// 4. 璋冪敤宸ヤ綔娴佺紪鎺掑櫒鎵ц浠诲姟鐘舵�佹満
+    ///
+    /// 浣跨敤 [DisallowConcurrentExecution] 绂佹骞跺彂鎵ц锛岀‘淇濆悓涓�璁惧鐨勪换鍔′覆琛屽鐞嗐��
+    /// 鍏蜂綋鐨勭姸鎬佹満娴佺▼閫昏緫濮旀墭缁� <see cref="RobotWorkflowOrchestrator"/> 澶勭悊銆�
+    /// </remarks>
     [DisallowConcurrentExecution]
     public class RobotJob : IJob
     {
+        /// <summary>
+        /// 浠诲姟鎬绘暟涓婇檺
+        /// </summary>
+        /// <remarks>
+        /// 褰撴満鍣ㄤ汉澶勭悊鐨勮揣鐗╂暟閲忚揪鍒版涓婇檺鏃讹紝涓嶅啀涓嬪彂鏂颁换鍔°��
+        /// 闃叉鏈哄櫒浜鸿繃搴﹀姵绱垨绯荤粺杩囪浇銆�
+        /// </remarks>
         private const int MaxTaskTotalNum = 48;
 
-        private readonly TcpSocketServer _TcpSocket;
+        /// <summary>
+        /// 娑堟伅浜嬩欢璁㈤槄鏍囧織
+        /// </summary>
+        /// <remarks>
+        /// 浣跨敤鍘熷瓙鎿嶄綔纭繚鍏ㄥ眬鍙闃呬竴娆� TCP 娑堟伅浜嬩欢銆�
+        /// 闃叉澶氫釜 Job 瀹炰緥閲嶅璁㈤槄瀵艰嚧娑堟伅琚娆″鐞嗐��
+        /// </remarks>
+        private static int _messageSubscribedFlag;
 
-        //private static readonly ConcurrentDictionary<string, RobotSocketState> _socketStates = new();
-        private static int _eventSubscribedFlag;
+        /// <summary>
+        /// 鏈烘鎵嬪鎴风杩炴帴绠$悊鍣�
+        /// </summary>
+        /// <remarks>
+        /// 璐熻矗绠$悊 TCP 杩炴帴鐨勭敓鍛藉懆鏈燂紝鍖呮嫭杩炴帴銆佹柇寮�銆佹秷鎭彂閫佺瓑銆�
+        /// </remarks>
+        private readonly RobotClientManager _clientManager;
 
-        private readonly ITaskService _taskService;
-        private readonly IRobotTaskService _robotTaskService;
-        private readonly ICacheService _cache;
-        private readonly HttpClientHelper _httpClientHelper;
+        /// <summary>
+        /// 鏈烘鎵嬬姸鎬佺鐞嗗櫒
+        /// </summary>
+        /// <remarks>
+        /// 璐熻矗绠$悊 Redis 缂撳瓨涓殑鏈烘鎵嬬姸鎬侊紝鍖呮嫭璇诲啓鍜屽苟鍙戞帶鍒躲��
+        /// </remarks>
+        private readonly RobotStateManager _stateManager;
 
-        private static IRobotTaskService _latestRobotTaskService = null!;
-        private static ITaskService _latestTaskService = null!;
+        /// <summary>
+        /// 娑堟伅璺敱鍣�
+        /// </summary>
+        /// <remarks>
+        /// 璐熻矗澶勭悊浠� TCP 鏈嶅姟鍣ㄦ帴鏀跺埌鐨勬秷鎭紝骞跺垎鍙戠粰鍚堥�傜殑澶勭悊鍣ㄣ��
+        /// 鏄秷鎭鐞嗙閬撶殑鍏ュ彛銆�
+        /// </remarks>
+        private readonly IRobotMessageRouter _messageRouter;
 
-        public RobotJob(TcpSocketServer TcpSocket, IRobotTaskService RobottaskService, ITaskService TaskService, ICacheService cache, HttpClientHelper httpClientHelper)
+        /// <summary>
+        /// 鏈哄櫒浜轰换鍔″鐞嗗櫒
+        /// </summary>
+        /// <remarks>
+        /// 璐熻矗浠诲姟鐨勪笅鍙戙�佺姸鎬佹洿鏂般�佷笌 WMS 鐨勪氦浜掔瓑銆�
+        /// </remarks>
+        private readonly RobotTaskProcessor _taskProcessor;
+
+        /// <summary>
+        /// 鏈哄櫒浜哄伐浣滄祦缂栨帓鍣�
+        /// </summary>
+        /// <remarks>
+        /// 璐熻矗鎵ц浠诲姟鐨勭姸鎬佹満娴佽浆锛屾牴鎹綋鍓嶇姸鎬佸喅瀹氫笅涓�姝ュ姩浣溿��
+        /// 杩欐槸鏍稿績鐨勪笟鍔¢�昏緫缂栨帓缁勪欢銆�
+        /// </remarks>
+        private readonly IRobotWorkflowOrchestrator _workflowOrchestrator;
+
+        /// <summary>
+        /// 鏃ュ織璁板綍鍣�
+        /// </summary>
+        private readonly ILogger<RobotJob> _logger;
+
+        /// <summary>
+        /// 鏋勯�犲嚱鏁�
+        /// </summary>
+        /// <remarks>
+        /// 閲囩敤渚濊禆娉ㄥ叆鏂瑰紡鑾峰彇鎵�闇�鏈嶅姟锛屽苟瀹屾垚缁勪欢鐨勫垵濮嬪寲鍜岀粍瑁呫��
+        /// 杩欓噷浣撶幇浜�"鎺у埗鍙嶈浆"鍜�"渚濊禆娉ㄥ叆"鐨勮璁″師鍒欍��
+        /// </remarks>
+        /// <param name="tcpSocket">TCP Socket 鏈嶅姟鍣ㄥ疄渚�</param>
+        /// <param name="robotTaskService">鏈哄櫒浜轰换鍔℃湇鍔�</param>
+        /// <param name="taskService">閫氱敤浠诲姟鏈嶅姟</param>
+        /// <param name="cache">缂撳瓨鏈嶅姟</param>
+        /// <param name="httpClientHelper">HTTP 瀹㈡埛绔府鍔╃被锛岀敤浜庤皟鐢� WMS 鎺ュ彛</param>
+        /// <param name="logger">鏃ュ織璁板綍鍣�</param>
+        public RobotJob(
+            TcpSocketServer tcpSocket,
+            IRobotTaskService robotTaskService,
+            ITaskService taskService,
+            ICacheService cache,
+            HttpClientHelper httpClientHelper,
+            ILogger<RobotJob> logger)
         {
-            _TcpSocket = TcpSocket;
-            _robotTaskService = RobottaskService;
-            _taskService = TaskService;
-            _cache = cache;
-            _httpClientHelper = httpClientHelper;
+            // 鍒濆鍖栫姸鎬佺鐞嗗櫒锛屼紶鍏ョ紦瀛樻湇鍔�
+            _stateManager = new RobotStateManager(cache, _logger);
+            _logger = logger;
 
-            _latestRobotTaskService = RobottaskService;
-            _latestTaskService = TaskService;
+            // 鍒涘缓 Socket 缃戝叧锛屽皝瑁� TcpSocketServer 鐨勮闂�
+            // 鍚庣画鏇挎崲閫氫俊瀹炵幇鏃跺彧闇�鏇挎崲缃戝叧灞�
+            ISocketClientGateway socketGateway = new SocketClientGateway(tcpSocket);
+
+            // 鍒濆鍖栦换鍔″鐞嗗櫒
+            _taskProcessor = new RobotTaskProcessor(socketGateway, _stateManager, robotTaskService, taskService, httpClientHelper, _logger);
+
+            // 鍒濆鍖栧鎴风绠$悊鍣�
+            _clientManager = new RobotClientManager(tcpSocket, _stateManager, _logger);
+
+            // 鍒濆鍖栧懡浠ゅ鐞嗗櫒
+            // 绠�鍗曞懡浠ゅ鐞嗗櫒锛氬鐞嗙姸鎬佹洿鏂扮瓑绠�鍗曞懡浠�
+            var simpleCommandHandler = new RobotSimpleCommandHandler(_taskProcessor);
+            // 鍓嶇紑鍛戒护澶勭悊鍣細澶勭悊 pickfinished銆乸utfinished 绛夊甫鍙傛暟鐨勫懡浠�
+            var prefixCommandHandler = new RobotPrefixCommandHandler(robotTaskService, _taskProcessor, _stateManager, socketGateway);
+
+            // 鍒濆鍖栨秷鎭矾鐢卞櫒
+            _messageRouter = new RobotMessageHandler(socketGateway, _stateManager, cache, simpleCommandHandler, prefixCommandHandler, logger);
+
+            // 鍒濆鍖栧伐浣滄祦缂栨帓鍣�
+            _workflowOrchestrator = new RobotWorkflowOrchestrator(_stateManager, _clientManager, _taskProcessor, robotTaskService, _logger);
+
+            // 璁㈤槄瀹㈡埛绔柇寮�杩炴帴浜嬩欢
+            _clientManager.OnClientDisconnected += OnClientDisconnected;
+
+            // 鍏ㄥ眬鍙闃呬竴娆� TCP 娑堟伅浜嬩欢锛堜繚鎸佸師鏈夎涓猴級
+            // 浣跨敤 Interlocked.CompareExchange 瀹炵幇鍘熷瓙鎿嶄綔
+            if (System.Threading.Interlocked.CompareExchange(ref _messageSubscribedFlag, 1, 0) == 0)
+            {
+                // 灏嗘秷鎭矾鐢卞櫒鐨勫鐞嗘柟娉曠粦瀹氬埌 TCP 鏈嶅姟鍣ㄧ殑娑堟伅鎺ユ敹浜嬩欢
+                tcpSocket.MessageReceived += _messageRouter.HandleMessageReceivedAsync;
+                _logger.LogError("鏈哄櫒鎵婽CP娑堟伅浜嬩欢宸茶闃�");
+                QuartzLogger.Error($"鏈哄櫒鎵婽CP娑堟伅浜嬩欢宸茶闃�");
+            }
         }
 
+        /// <summary>
+        /// 瀹㈡埛绔柇寮�杩炴帴鐨勪簨浠跺鐞�
+        /// </summary>
+        /// <remarks>
+        /// 褰撳鎴风鏂紑杩炴帴鏃惰褰曟棩蹇楋紝渚夸簬鎺掓煡闂銆�
+        /// </remarks>
+        /// <param name="sender">浜嬩欢鍙戦�佽��</param>
+        /// <param name="state">鏂紑杩炴帴鐨勬満姊版墜鐘舵��</param>
+        private void OnClientDisconnected(object? sender, RobotSocketState state)
+        {
+            _logger.LogError("瀹㈡埛绔凡鏂紑杩炴帴");
+            QuartzLogger.Error($"瀹㈡埛绔凡鏂紑杩炴帴", state.RobotCrane.DeviceName);
+        }
+
+        /// <summary>
+        /// Quartz Job 鐨勬墽琛屽叆鍙�
+        /// </summary>
+        /// <remarks>
+        /// 鎵ц娴佺▼锛�
+        /// 1. 浠� JobDataMap 鑾峰彇璁惧淇℃伅
+        /// 2. 纭繚瀹㈡埛绔凡杩炴帴骞惰闃呮秷鎭�
+        /// 3. 杞寰呭鐞嗕换鍔�
+        /// 4. 璋冪敤宸ヤ綔娴佺紪鎺掑櫒鎵ц浠诲姟
+        ///
+        /// 娉ㄦ剰锛氭鏂规硶鍙兘棰戠箒璋冪敤锛堟瘡绉掍竴娆★級锛岄渶娉ㄦ剰鎬ц兘銆�
+        /// </remarks>
+        /// <param name="context">Quartz 浣滀笟鎵ц涓婁笅鏂囷紝鍖呭惈浣滀笟璇︽儏鍜屾暟鎹�</param>
         public async Task Execute(IJobExecutionContext context)
         {
+            // 浠� JobDataMap 涓幏鍙栦綔涓氬弬鏁�
             bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
+
+            // 灏嗗弬鏁拌浆鎹负鏈哄櫒浜鸿澶囦俊鎭�
             RobotCraneDevice robotCrane = (RobotCraneDevice?)value ?? new RobotCraneDevice();
+
+            // 濡傛灉娌℃湁鑾峰彇鍒版湁鏁堢殑璁惧淇℃伅锛岀洿鎺ヨ繑鍥�
             if (!flag || robotCrane.IsNullOrEmpty())
             {
                 return;
             }
 
+            // 鑾峰彇璁惧 IP 鍦板潃锛屼綔涓虹姸鎬佺紦瀛樼殑閿�
             string ipAddress = robotCrane.IPAddress;
 
-            // 鑾峰彇鎴栧垱寤虹姸鎬�
-            RobotSocketState state = _cache.GetOrAdd($"{RedisPrefix.Code}:{RedisName.SocketDevices}:{ipAddress}", _ => new RobotSocketState
-            {
-                IPAddress = ipAddress,
-                RobotCrane = robotCrane
-            });
+            // 鑾峰彇鎴栧垱寤鸿澶囩姸鎬佸璞�
+            RobotSocketState state = _stateManager.GetOrCreateState(ipAddress, robotCrane);
 
-            // 鏇存柊璁惧淇℃伅
+            // 鏇存柊璁惧鍩虹淇℃伅锛堜互闃茶澶囦俊鎭湪杩愯鏈熼棿鍙戠敓鍙樺寲锛�
             state.RobotCrane = robotCrane;
 
             try
             {
-                // 妫�鏌ユ槸鍚︽湁璇ュ鎴风杩炴帴
-                var clientIds = _TcpSocket.GetClientIds();
-                if (!clientIds.Contains(ipAddress))
+                // 纭繚瀹㈡埛绔凡杩炴帴骞惰闃呮秷鎭簨浠�
+                // 濡傛灉瀹㈡埛绔湭杩炴帴鎴栬闃呭け璐ワ紝鐩存帴杩斿洖绛夊緟涓嬫璋冨害
+                if (!_clientManager.EnsureClientSubscribed(ipAddress, robotCrane))
                 {
                     return;
                 }
 
-                // 璁㈤槄涓�娆� message 浜嬩欢锛堝叏灞�涓�娆★級
-                if (Interlocked.CompareExchange(ref _eventSubscribedFlag, 1, 0) == 0)
-                {
-                    _TcpSocket.MessageReceived += _TcpSocket_MessageReceived;
-                    _TcpSocket.RobotReceived += _TcpSocket_RobotReceived;
-                }
+                // 杞鑾峰彇璇ヨ澶囩殑寰呭鐞嗕换鍔�
+                var task = _taskProcessor.GetTask(robotCrane);
 
-                if (!state.IsEventSubscribed)
-                {
-                    if (_TcpSocket._clients.TryGetValue(ipAddress, out TcpClient client))
-                    {
-                        _ = _TcpSocket.HandleClientAsync(client, robotCrane.IPAddress, _TcpSocket._cts.Token, state)
-                            .ContinueWith(t =>
-                            {
-                                if (t.IsFaulted)
-                                    Console.WriteLine($"HandleClientAsync error: {t.Exception?.GetBaseException().Message}");
-                            }, TaskContinuationOptions.OnlyOnFaulted);
-                        state.IsEventSubscribed = true;
-
-                        // 鏇存柊缂撳瓨涓殑鐘舵��
-                        _cache.TryUpdateIfChanged($"{RedisPrefix.Code}:{RedisName.SocketDevices}:{ipAddress}", state);
-                    }
-                }
-
-                // 鑾峰彇浠诲姟骞剁紦瀛樺埌鐘舵�佷腑
-                Dt_RobotTask? task = GetTask(robotCrane);
+                // 濡傛灉鏈夊緟澶勭悊浠诲姟
                 if (task != null)
                 {
-                    if (task.RobotTaskTotalNum <= MaxTaskTotalNum)
+                    // 鑾峰彇鏈�鏂扮殑璁惧鐘舵��
+                    var latestState = _stateManager.GetState(ipAddress);
+                    if (latestState == null)
                     {
-                        // 澶勭悊姝e湪鎵ц鐨勪换鍔�
-                        if (state.RobotRunMode == 2 && state.RobotControlMode == 1 && state.OperStatus != "Running")
-                        {
-                            if (state.CurrentAction == "PickFinished" && state.RobotArmObject == 1 && task.RobotTaskState == TaskRobotStatusEnum.RobotPickFinish.GetHashCode())
-                            {
-                                string taskString = $"Putbattery,{task.RobotTargetAddress}";
-                                bool result = await _TcpSocket.SendToClientAsync(ipAddress, taskString);
-                                if (result)
-                                {
-                                    task.RobotTaskState = TaskRobotStatusEnum.RobotExecuting.GetHashCode();
-                                    await _robotTaskService.UpdateRobotTaskAsync(task);
-                                }
-                            }
-                            else if (state.CurrentAction == "PutFinished" && state.RobotArmObject == 0 && task.RobotTaskState == TaskRobotStatusEnum.RobotPutFinish.GetHashCode())
-                            {
-                                task.RobotTaskState = TaskRobotStatusEnum.RobotExecuting.GetHashCode();
-                                await _robotTaskService.UpdateRobotTaskAsync(task);
-                            }
-                            else if (state.OperStatus == "Homed" && state.RobotArmObject == 0 && task.RobotTaskState != TaskRobotStatusEnum.RobotExecuting.GetHashCode())
-                            {
-                                // 闅忔満鐢熸垚涓ゅぉ鎵樼洏鏉$爜瀛樻斁鍒颁袱涓彉閲忛噷闈�
-                                // 瀹氫箟鍓嶇紑锛堜緥濡傦細TRAY浠h〃鎵樼洏锛�
-                                // 缁勭洏璇诲彇绾夸綋鏉$爜
-                                if (task.RobotTaskType == RobotTaskTypeEnum.GroupPallet.GetHashCode())
-                                {
-                                    string prefix = "TRAY";
+                        // 鐘舵�佷笉瀛樺湪锛屽彲鑳借澶囨湭鍒濆鍖�
+                        return;
+                    }
 
-                                    // 鐢熸垚涓や釜鎵樼洏鏉$爜
-                                    string trayBarcode1 = GenerateTrayBarcode(state, prefix);
-                                    string trayBarcode2 = GenerateTrayBarcode(state, prefix);
-                                    if (!trayBarcode1.IsNullOrEmpty() && !trayBarcode2.IsNullOrEmpty())
-                                    {
-
-                                        await SendSocketRobotPickAsync(task, state);
-                                    }
-                                }
-                                else // 鎹㈢洏鐩存帴鍙戦�佸彇璐у湴鍧�
-                                {
-                                    await SendSocketRobotPickAsync(task, state);
-                                }
-                            }
-
-                            if (state.CurrentTask.IsNullOrEmpty() && state.ToJson() != task.ToJson())
-                            {
-                                state.IsSplitPallet = task.RobotTaskType == RobotTaskTypeEnum.SplitPallet.GetHashCode();
-                                state.IsGroupPallet = task.RobotTaskType == RobotTaskTypeEnum.GroupPallet.GetHashCode() || task.RobotTaskType == RobotTaskTypeEnum.ChangePallet.GetHashCode();
-                                state.CurrentTask = task;
-                                // 鏇存柊缂撳瓨涓殑鐘舵��
-                                _cache.TryUpdateIfChanged($"{RedisPrefix.Code}:{RedisName.SocketDevices}:{ipAddress}", state);
-                            }
-                        }
+                    // 妫�鏌ヤ换鍔℃�绘暟鏄惁鏈揪鍒颁笂闄�
+                    if (latestState.RobotTaskTotalNum < MaxTaskTotalNum)
+                    {
+                        // 璋冪敤宸ヤ綔娴佺紪鎺掑櫒鎵ц浠诲姟
+                        // 缂栨帓鍣ㄤ細鏍规嵁褰撳墠鐘舵�佸喅瀹氫笅涓�姝ュ姩浣�
+                        await _workflowOrchestrator.ExecuteAsync(latestState, task, ipAddress);
                     }
                 }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-            }
-            finally
-            {
-                // 鍙�夛細鍦ㄨ繖閲屽鐞嗕换浣曢渶瑕佸湪浠诲姟瀹屾垚鍚庢墽琛岀殑娓呯悊宸ヤ綔
-            }
-        }
-
-        //涓存椂娴嬭瘯鐢�
-        private static string GenerateTrayBarcode(RobotSocketState state, string prefix = "")
-        {
-            // 褰撳墠鏃ユ湡
-            string datePart = DateTime.Now.ToString("yyyyMMdd");
-
-            // 鏃堕棿鎴筹紙鏃跺垎绉掞級
-            string timePart = DateTime.Now.ToString("HHmmss");
-
-            // 闅忔満鏁�
-            string randomPart = Random.Shared.Next(100, 1000).ToString();
-
-            // 缁勫悎锛氬墠缂� + 鏃ユ湡 + 鏃堕棿 + 闅忔満鏁�
-            var barCode = prefix + datePart + timePart + randomPart;
-            state.CellBarcode.Add(barCode);
-
-            return barCode;
-        }
-
-        /// <summary>
-        ///  浜嬩欢锛氬鎴风鏂紑杩炴帴鏃惰Е鍙�
-        /// </summary>
-        /// <param name="clientId"></param>
-        /// <returns></returns>
-        private Task<string?> _TcpSocket_RobotReceived(string clientId)
-        {
-            var robotSocketState = _cache.Get<RobotSocketState>($"{RedisPrefix.Code}:{RedisName.SocketDevices}:{clientId}");
-            robotSocketState.IsEventSubscribed = false;
-            robotSocketState.CurrentAction = "";
-            robotSocketState.OperStatus = "";
-            robotSocketState.RobotArmObject = 0;
-            robotSocketState.RobotControlMode = 0;
-            robotSocketState.RobotRunMode = 0;
-            _cache.TryUpdateIfChanged($"{RedisPrefix.Code}:{RedisName.SocketDevices}:{clientId}", robotSocketState);
-            return Task.FromResult<string?>(null);
-        }
-
-        /// <summary>
-        /// 浜嬩欢锛氭敹鍒版秷鎭椂瑙﹀彂
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="isJson"></param>
-        /// <param name="client"></param>
-        /// <param name="state"></param>
-        /// <returns></returns>
-        private async Task<string?> _TcpSocket_MessageReceived(string message, bool isJson, TcpClient client, RobotSocketState state)
-        {
-            if (!(bool)(_cache?.TryGetValue($"{RedisPrefix.Code}:{RedisName.SocketDevices}:{client.Client.RemoteEndPoint}", out state)))
-                return null;
-
-            string messageLower = message.ToLowerInvariant();
-
-            if (await IsSimpleCommandAsync(messageLower, state))
-            {
-                await _TcpSocket.SendMessageAsync(client, message);
-            }
-            else if (IsPrefixCommand(messageLower))
-            {
-                try
-                {
-                    var parts = message.Split(',');
-                    if (parts.Length >= 1 && state.CurrentTask != null)
-                    {
-                        var cmd = parts[0].ToLowerInvariant();
-                        int[] positions = parts.Skip(1)
-                           .Select(p => int.TryParse(p, out int value) ? value : (int?)null)
-                           .Where(v => v.HasValue && v.Value != 0)
-                           .Select(v => v!.Value)
-                           .ToArray();
-
-                        var task = await _latestRobotTaskService.Repository.QueryFirstAsync(x => x.RobotTaskId == state.CurrentTask.RobotTaskId);
-
-                        if (cmd.StartsWith("pickfinished"))
-                        {
-                            if (state.IsSplitPallet)
-                            {
-                                var stockDTO = BuildStockDTO(state, positions);
-                                state.LastPickPositions = positions;
-
-                                var result = _httpClientHelper.Post<WebResponseContent>(nameof(ConfigKey.SplitPalletAsync), stockDTO.ToJson());
-
-                                if (result.Data.Status && result.IsSuccess)
-                                {
-                                    state.CurrentAction = "PickFinished";
-                                }
-                            }
-                            else
-                            {
-                                state.CurrentAction = "PickFinished";
-                            }
-
-                            state.LastPickPositions = positions;
-                            task.RobotTaskState = TaskRobotStatusEnum.RobotPickFinish.GetHashCode();
-                            await _latestRobotTaskService.Repository.UpdateDataAsync(task);
-                        }
-                        else if (cmd.StartsWith("putfinished"))
-                        {
-                            bool putSuccess = true;
-                            if (state.IsGroupPallet)
-                            {
-                                state.LastPutPositions = positions;
-                                var stockDTO = BuildStockDTO(state, positions);
-                                var configKey = state.CurrentTask?.RobotTaskType == RobotTaskTypeEnum.ChangePallet.GetHashCode()
-                                    ? nameof(ConfigKey.ChangePalletAsync) : nameof(ConfigKey.GroupPalletAsync);
-
-                                var result = _httpClientHelper.Post<WebResponseContent>(configKey, stockDTO.ToJson());
-                                putSuccess = result.Data.Status && result.IsSuccess;
-                            }
-
-                            if (putSuccess)
-                            {
-                                state.CurrentAction = "PutFinished";
-                                state.RobotTaskTotalNum += positions.Length;
-                                task.RobotTaskTotalNum += positions.Length;
-                            }
-
-                            task.RobotTaskState = TaskRobotStatusEnum.RobotPutFinish.GetHashCode();
-                            await _latestRobotTaskService.Repository.UpdateDataAsync(task);
-                        }
-
-                        await _TcpSocket.SendMessageAsync(client, message);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"RobotJob MessageReceived Error: {ex.Message}");
-                }
-            }
-
-            // 鏇存柊缂撳瓨涓殑鐘舵��
-            _cache.TryUpdateIfChanged($"{RedisPrefix.Code}:{RedisName.SocketDevices}:{state.IPAddress}", state);
-
-            return null;
-        }
-
-        /// <summary>
-        /// 鏈烘鎵嬬畝鍗曞懡浠ゅ鐞�
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="state"></param>
-        /// <returns></returns>
-        private async Task<bool> IsSimpleCommandAsync(string message, RobotSocketState state)
-        {
-            switch (message)
-            {
-                case "homing":
-                    state.OperStatus = "Homing";
-                    return true;
-
-                case "homed":
-                    state.OperStatus = "Homed";
-                    return true;
-
-                case "picking":
-                    state.CurrentAction = "Picking";
-                    return true;
-
-                case "puting":
-                    state.CurrentAction = "Putting";
-                    return true;
-
-                case "allpickfinished": // 鍙栬揣瀹屾垚
-                    state.CurrentAction = "AllPickFinished";
-                    if (state.CurrentTask?.RobotTaskType == RobotTaskTypeEnum.SplitPallet.GetHashCode() || state.CurrentTask?.RobotTaskType == RobotTaskTypeEnum.ChangePallet.GetHashCode())
-                    {
-                        await HandleInboundTaskAsync(state, useSourceAddress: true);
-                    }
-                    return true;
-
-                case "allputfinished": // 鏀捐揣瀹屾垚
-                    state.CurrentAction = "AllPutFinished";
-                    if (state.CurrentTask?.RobotTaskType == RobotTaskTypeEnum.GroupPallet.GetHashCode() || state.CurrentTask?.RobotTaskType == RobotTaskTypeEnum.ChangePallet.GetHashCode())
-                    {
-                        await HandleInboundTaskAsync(state, useSourceAddress: false);
-                    }
-                    return true;
-
-                case "running":
-                    state.OperStatus = "Running";
-                    return true;
-
-                case "pausing":
-                    state.OperStatus = "Pausing";
-                    return true;
-
-                case "warming":
-                    state.OperStatus = "Warming";
-                    return true;
-
-                case "emstoping":
-                    state.OperStatus = "Emstoping";
-                    return true;
-
-                case "runmode,1":
-                    state.RobotRunMode = 1;
-                    return true;
-
-                case "runmode,2":
-                    state.RobotRunMode = 2;
-                    return true;
-
-                case "controlmode,1":
-                    state.RobotControlMode = 1;
-                    return true;
-
-                case "controlmode,2":
-                    state.RobotControlMode = 2;
-                    return true;
-
-                case "armobject,1":
-                    state.RobotArmObject = 1;
-                    return true;
-
-                case "armobject,0":
-                    state.RobotArmObject = 0;
-                    return true;
-
-                default:
-                    return false;
-            }
-        }
-
-        private async Task HandleInboundTaskAsync(RobotSocketState state, bool useSourceAddress)
-        {
-            var currentTask = state.CurrentTask;
-            if (currentTask == null)
-            {
-                return;
-            }
-
-            string roadway = currentTask.RobotRoadway == "1" ? "GWSC001" : currentTask.RobotRoadway == "2" ? "HCSC001" : "SC001";
-            int warehouseId = currentTask.RobotRoadway == "1" ? 1 : currentTask.RobotRoadway == "2" ? 2 : 3;
-
-            CreateTaskDto taskDto = new CreateTaskDto
-            {
-                PalletCode = currentTask.RobotTargetAddressPalletCode ?? string.Empty,
-                SourceAddress = currentTask.RobotSourceAddress ?? string.Empty,
-                TargetAddress = currentTask.RobotTargetAddress ?? string.Empty,
-                Roadway = roadway,
-                WarehouseId = warehouseId,
-                PalletType = 1,
-                TaskType = 4
-            };
-            var result = _httpClientHelper.Post<WebResponseContent>(nameof(ConfigKey.CreateTaskInboundAsync), taskDto.ToJson());
-            if (!result.Data.Status && result.IsSuccess)
-            {
-                return;
-            }
-
-            WMSTaskDTO taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(result.Data.ToString() ?? string.Empty) ?? new WMSTaskDTO();
-            var content = _latestTaskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
-            if (!content.Status) return;
-
-            var taskInfo = _latestTaskService.QueryByTaskNum(taskDTO.TaskNum);
-            if (taskInfo == null) return;
-
-            string targetAddress = useSourceAddress ? taskDTO.SourceAddress : taskDTO.TargetAddress;
-
-            IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceProDTOs.Any(d => d.DeviceChildCode == targetAddress));
-            device?.Communicator.Write(nameof(ConveyorLineDBNameNew.Target), taskInfo.NextAddress);
-            device?.Communicator.Write(nameof(ConveyorLineDBNameNew.TaskNo), taskDTO.TaskNum);
-            device?.Communicator.Write(nameof(ConveyorLineDBNameNew.WCS_STB), 1);
-        }
-
-        /// <summary>
-        /// 鏈烘鎵嬪墠缂�鍛戒护澶勭悊
-        /// </summary>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        private static bool IsPrefixCommand(string message)
-        {
-            return message.StartsWith("pickfinished") || message.StartsWith("putfinished");
-        }
-
-        private static StockDTO BuildStockDTO(RobotSocketState state, int[] positions)
-        {
-            string sss = state.ToJson();
-            return new StockDTO
-            {
-                SourceLineNo = state.CurrentTask.RobotSourceAddressLineCode,
-                SourcePalletNo = state.CurrentTask.RobotSourceAddressPalletCode,
-                TargetPalletNo = state.CurrentTask.RobotTargetAddressPalletCode,
-                TargetLineNo = state.CurrentTask.RobotTargetAddressLineCode,
-                Details = positions
-                    .Where(x => x > 0)
-                    .OrderBy(x => x)
-                    .Select((x, idx) => new StockDetailDTO
-                    {
-                        Quantity = state.RobotTaskTotalNum > 0 ? state.RobotTaskTotalNum + positions.Length : positions.Length,
-                        Channel = x,
-                        CellBarcode = state.CellBarcode?.Count > 0 ? state.CellBarcode[x - 1] : ""
-                    })
-                    .ToList()
-            };
-        }
-
-        private Dt_RobotTask? GetTask(RobotCraneDevice robotCrane)
-        {
-            return _robotTaskService.QueryRobotCraneTask(robotCrane.DeviceCode);
-        }
-
-        /// <summary>
-        /// 鍙戦�佹満姊版墜鍙栬揣鍛戒护
-        /// </summary>
-        /// <param name="task"></param>
-        /// <param name="state"></param>
-        /// <returns></returns>
-        private async Task SendSocketRobotPickAsync(Dt_RobotTask task, RobotSocketState state)
-        {
-            string taskString = $"Pickbattery,{task.RobotSourceAddress}";
-            // 鍙戦�佷换鍔℃寚浠�
-            bool result = await _TcpSocket.SendToClientAsync(state.IPAddress, taskString);
-            if (result)
-            {
-                // TODO 澶勭悊鎴愬姛鍙戦�佷换鍔℃寚浠ゅ悗鐨勯�昏緫
-                task.RobotTaskState = TaskRobotStatusEnum.RobotExecuting.GetHashCode();
-                result = await _robotTaskService.UpdateRobotTaskAsync(task);
-                // 鏇存柊缂撳瓨涓殑鐘舵��
-                _cache.TryUpdateIfChanged($"{RedisPrefix.Code}:{RedisName.SocketDevices}:{state.IPAddress}", state);
+                // 寮傚父澶勭悊宸插湪缁勪欢鍐呴儴杩涜锛孞ob 灞備繚鎸佸厹搴曡涔�
+                // 璁板綍寮傚父鑰屼笉鏄潤榛樺悶鎺夛紝渚夸簬鎺掓煡闂
+                _logger?.LogError(ex, "RobotJob鎵ц寮傚父锛孖P: {IpAddress}", ipAddress);
+                QuartzLogger.Error($"RobotJob鎵ц寮傚父锛孖P: {ipAddress}", state.RobotCrane.DeviceName, ex);
             }
         }
     }
-
-    public class RobotSocketState
-    {
-        public string IPAddress { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 鏄惁宸茶闃呮秷鎭簨浠�
-        /// </summary>
-        public bool IsEventSubscribed { get; set; }
-
-        /// <summary>
-        /// 鏈烘鎵嬭繍琛屾ā寮�
-        /// </summary>
-        public int? RobotRunMode { get; set; }
-
-        /// <summary>
-        /// 鏈烘鎵嬫帶鍒舵ā寮�
-        /// </summary>
-        public int? RobotControlMode { get; set; }
-
-        /// <summary>
-        /// 鏈烘鎵嬫槸鍚︽姄鍙栫墿鏂欙紝0-鏃犵墿鏂欙紝1-鏈夌墿鏂�
-        /// </summary>
-        public int? RobotArmObject { get; set; }
-
-        /// <summary>
-        /// 鏈烘鎵嬭澶囦俊鎭�
-        /// </summary>
-        public RobotCraneDevice? RobotCrane { get; set; }
-
-        /// <summary>
-        /// 褰撳墠鍔ㄤ綔
-        /// </summary>
-        public string? CurrentAction { get; set; }
-
-        /// <summary>
-        /// 褰撳墠鐘舵��
-        /// </summary>
-        public string? OperStatus { get; set; }
-
-        /// <summary>
-        /// 鍙栬揣瀹屾垚浣嶇疆
-        /// </summary>
-        public int[]? LastPickPositions { get; set; }
-
-        /// <summary>
-        /// 鏀捐揣瀹屾垚浣嶇疆
-        /// </summary>
-        public int[]? LastPutPositions { get; set; }
-
-        /// <summary>
-        /// 鎶撳彇浣嶇疆鏉$爜
-        /// </summary>
-        public List<string> CellBarcode { get; set; }
-
-        /// <summary>
-        /// 褰撳墠鎶撳彇浠诲姟
-        /// </summary>
-        public Dt_RobotTask? CurrentTask { get; set; }
-
-        /// <summary>
-        /// 鏄惁闇�瑕佹媶鐩�
-        /// </summary>
-        public bool IsSplitPallet { get; set; }
-
-        /// <summary>
-        /// 鏄惁闇�瑕佺粍鐩�
-        /// </summary>
-        public bool IsGroupPallet { get; set; }
-
-        /// <summary>
-        /// 浠诲姟鎬绘暟
-        /// </summary>
-        public int RobotTaskTotalNum { get; set; }
-    }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3