From adb4016b5eb5b119a899480c321be996d9bf10bd Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 08 四月 2026 00:55:22 +0800
Subject: [PATCH] feat(robot): 完善机械手任务处理逻辑与状态管理
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs | 135 +++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 60 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 0a17d62..b564835 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
@@ -1,4 +1,5 @@
using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_Core.LogHelper;
using WIDESEAWCS_Tasks.Workflow.Abstractions;
namespace WIDESEAWCS_Tasks.Workflow
@@ -26,12 +27,21 @@
private readonly RobotTaskProcessor _taskProcessor;
/// <summary>
+ /// Socket 缃戝叧
+ /// </summary>
+ /// <remarks>
+ /// 鐢ㄤ簬鍚戝鎴风鍙戦�佸搷搴旀秷鎭��
+ /// </remarks>
+ private readonly ISocketClientGateway _socketClientGateway;
+
+ /// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="taskProcessor">浠诲姟澶勭悊鍣ㄥ疄渚�</param>
- public RobotSimpleCommandHandler(RobotTaskProcessor taskProcessor)
+ public RobotSimpleCommandHandler(RobotTaskProcessor taskProcessor, ISocketClientGateway socketClientGateway)
{
_taskProcessor = taskProcessor;
+ _socketClientGateway = socketClientGateway;
}
/// <summary>
@@ -71,12 +81,12 @@
// 鏈哄櫒浜烘鍦ㄥ洖闆�
case "homing":
- state.OperStatus = "Homing";
+ state.Homed = "Homing";
return true;
// 鏈哄櫒浜哄凡瀹屾垚鍥為浂
case "homed":
- state.OperStatus = "Homed";
+ state.Homed = "Homed";
return true;
// 鏈哄櫒浜烘鍦ㄨ繍琛�
@@ -113,71 +123,76 @@
// 鍏ㄩ儴鍙栬揣瀹屾垚
case "allpickfinished":
- {
- // 鏇存柊褰撳墠鍔ㄤ綔涓�"鍏ㄩ儴鍙栬揣瀹屾垚"
- state.CurrentAction = "AllPickFinished";
-
- // 鑾峰彇褰撳墠鍏宠仈鐨勪换鍔�
- var currentTask = state.CurrentTask;
- if (currentTask == null)
{
- // 娌℃湁浠诲姟鍏宠仈锛岃繑鍥� false
+ // 鏇存柊褰撳墠鍔ㄤ綔涓�"鍏ㄩ儴鍙栬揣瀹屾垚"
+ state.CurrentAction = "AllPickFinished";
+
+ // 鑾峰彇褰撳墠鍏宠仈鐨勪换鍔�
+ var currentTask = state.CurrentTask;
+ if (currentTask == null)
+ {
+ // 娌℃湁浠诲姟鍏宠仈锛岃繑鍥� false
+ return false;
+ }
+
+ // 鍒ゆ柇浠诲姟绫诲瀷
+ var robotTaskType = (RobotTaskTypeEnum)currentTask.RobotTaskType;
+
+ // 鍙湁鎷嗙洏鎴栨崲鐩樹换鍔￠渶瑕佸鐞嗗叆搴�
+ if (robotTaskType == RobotTaskTypeEnum.SplitPallet || robotTaskType == RobotTaskTypeEnum.ChangePallet)
+ {
+ // 澶勭悊鍏ュ簱浠诲姟鍥炰紶
+ // useSourceAddress: true 琛ㄧず浣跨敤婧愬湴鍧�锛堟媶鐩�/鎹㈢洏鍦烘櫙锛�
+ if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+ {
+ // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
+ _taskProcessor.DeleteTask(currentTask.RobotTaskId);
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
+ QuartzLogger.Info($"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+ return true;
+ }
+ }
return false;
}
-
- // 鍒ゆ柇浠诲姟绫诲瀷
- var robotTaskType = (RobotTaskTypeEnum)currentTask.RobotTaskType;
-
- // 鍙湁鎷嗙洏鎴栨崲鐩樹换鍔￠渶瑕佸鐞嗗叆搴�
- if (robotTaskType == RobotTaskTypeEnum.SplitPallet || robotTaskType == RobotTaskTypeEnum.ChangePallet)
- {
- // 澶勭悊鍏ュ簱浠诲姟鍥炰紶
- // useSourceAddress: true 琛ㄧず浣跨敤婧愬湴鍧�锛堟媶鐩�/鎹㈢洏鍦烘櫙锛�
- if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
- {
- // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
- _taskProcessor.DeleteTask(currentTask.RobotTaskId);
- return true;
- }
- }
- return false;
- }
// 鍏ㄩ儴鏀捐揣瀹屾垚
case "allputfinished":
- {
- // 鏇存柊褰撳墠鍔ㄤ綔涓�"鍏ㄩ儴鏀捐揣瀹屾垚"
- state.CurrentAction = "AllPutFinished";
-
- // 鑾峰彇褰撳墠鍏宠仈鐨勪换鍔�
- var currentTask = state.CurrentTask;
- if (currentTask == null)
{
+ // 鏇存柊褰撳墠鍔ㄤ綔涓�"鍏ㄩ儴鏀捐揣瀹屾垚"
+ state.CurrentAction = "AllPutFinished";
+
+ // 鑾峰彇褰撳墠鍏宠仈鐨勪换鍔�
+ var currentTask = state.CurrentTask;
+ if (currentTask == null)
+ {
+ return false;
+ }
+
+ // 鍒ゆ柇浠诲姟绫诲瀷
+ var robotTaskType = (RobotTaskTypeEnum)currentTask.RobotTaskType;
+
+ // 鍙湁缁勭洏鎴栨崲鐩樹换鍔￠渶瑕佸鐞嗗叆搴�
+ if (robotTaskType == RobotTaskTypeEnum.GroupPallet || robotTaskType == RobotTaskTypeEnum.ChangePallet)
+ {
+ // 澶勭悊鍏ュ簱浠诲姟鍥炰紶
+ // useSourceAddress: false 琛ㄧず浣跨敤鐩爣鍦板潃锛堢粍鐩�/鎹㈢洏鍦烘櫙锛�
+ if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
+ {
+ // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
+ _taskProcessor.DeleteTask(currentTask.RobotTaskId);
+
+ // 娓呯悊鐘舵�侊紝涓轰笅涓�涓换鍔″仛鍑嗗
+ state.CurrentTask = null; // 娓呴櫎褰撳墠浠诲姟
+ state.RobotTaskTotalNum = 0; // 閲嶇疆浠诲姟璁℃暟
+ state.CellBarcode = new List<string>(); // 娓呯┖鏉＄爜鍒楄〃
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+ QuartzLogger.Info($"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
+ return true;
+ }
+ }
return false;
}
-
- // 鍒ゆ柇浠诲姟绫诲瀷
- var robotTaskType = (RobotTaskTypeEnum)currentTask.RobotTaskType;
-
- // 鍙湁缁勭洏鎴栨崲鐩樹换鍔￠渶瑕佸鐞嗗叆搴�
- if (robotTaskType == RobotTaskTypeEnum.GroupPallet || robotTaskType == RobotTaskTypeEnum.ChangePallet)
- {
- // 澶勭悊鍏ュ簱浠诲姟鍥炰紶
- // useSourceAddress: false 琛ㄧず浣跨敤鐩爣鍦板潃锛堢粍鐩�/鎹㈢洏鍦烘櫙锛�
- if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
- {
- // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
- _taskProcessor.DeleteTask(currentTask.RobotTaskId);
-
- // 娓呯悊鐘舵�侊紝涓轰笅涓�涓换鍔″仛鍑嗗
- state.CurrentTask = null; // 娓呴櫎褰撳墠浠诲姟
- state.RobotTaskTotalNum = 0; // 閲嶇疆浠诲姟璁℃暟
- state.CellBarcode = new List<string>(); // 娓呯┖鏉＄爜鍒楄〃
- return true;
- }
- }
- return false;
- }
// ==================== 妯″紡鍒囨崲鍛戒护 ====================
@@ -221,4 +236,4 @@
}
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3