From 0f710285d9f02e3d4cea19557e17945e9ef9532b Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期五, 01 五月 2026 09:48:49 +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/Workflow/RobotSimpleCommandHandler.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 2c7f640..eb8c01e 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
@@ -221,8 +221,10 @@
QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,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;
@@ -335,8 +337,10 @@
}
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");
QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
@@ -371,8 +375,10 @@
}
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");
QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
@@ -411,8 +417,10 @@
// 娓呯悊鐘舵�侊紝涓轰笅涓�涓换鍔″仛鍑嗗
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");
QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
--
Gitblit v1.9.3