From 05999b9c77f009ac9a7e98366bc3d23fbb8e83e7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期日, 26 四月 2026 17:46:10 +0800
Subject: [PATCH] feat: 更新数据库连接配置和机器人任务处理逻辑
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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 5c709bf..d60d160 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
@@ -159,6 +159,8 @@
var isResult = UpdateStatus(state, true);
if (!isResult)
return false;
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, "pickbatteryover");
return true;
// 鏀捐揣鎺ユ敹
@@ -166,6 +168,8 @@
isResult = UpdateStatus(state, false);
if (!isResult)
return false;
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, "putbatteryover");
return true;
// ==================== 鍏ㄩ儴瀹屾垚鍛戒护 ====================
@@ -213,8 +217,8 @@
return false;
}
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
- QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
state.CurrentTask = null;
state.RobotTaskTotalNum = 0;
@@ -242,14 +246,14 @@
return false;
}
- if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
- {
- QuartzLogHelper.LogError(_logger, $"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
- return false;
- }
+ //if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
+ //{
+ // QuartzLogHelper.LogError(_logger, $"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+ // return false;
+ //}
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
- QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
state.ChangePalletPhase = 0;
state.CurrentBatchIndex = 1;
@@ -281,8 +285,8 @@
return false;
}
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
- QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
return true;
}
return false;
@@ -334,8 +338,8 @@
state.RobotTaskTotalNum = 0;
state.CellBarcode = new List<string>();
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
- QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
state.ChangePalletPhase = 0;
state.CurrentBatchIndex = 1;
@@ -370,8 +374,8 @@
state.RobotTaskTotalNum = 0;
state.CellBarcode = new List<string>();
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
- QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
state.ChangePalletPhase = 0;
state.CurrentBatchIndex = 1;
@@ -461,14 +465,14 @@
public bool UpdateStatus(RobotSocketState state, bool isPick)
{
- var task = _taskProcessor.GetTask(state?.RobotCrane);
+ 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;
- _taskProcessor.UpdateRobotTask(task);
- return true;
+ return _taskProcessor.UpdateRobotTask(task);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3