From 5bf10c1dafe485d506ec534f98e5220a3b83dd17 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 16 四月 2026 23:16:46 +0800
Subject: [PATCH] feat(WCS&WMS): 机械手扫码NG处理与线体条码读取与添加批量MES绑定解绑接口
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs | 98 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 insertions(+), 7 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 b564835..e0b0a03 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
@@ -138,11 +138,49 @@
// 鍒ゆ柇浠诲姟绫诲瀷
var robotTaskType = (RobotTaskTypeEnum)currentTask.RobotTaskType;
- // 鍙湁鎷嗙洏鎴栨崲鐩樹换鍔￠渶瑕佸鐞嗗叆搴�
- if (robotTaskType == RobotTaskTypeEnum.SplitPallet || robotTaskType == RobotTaskTypeEnum.ChangePallet)
+ // 鎹㈢洏浠诲姟锛氫粎褰撴墍鏈夐樁娈靛畬鎴愭椂鎵嶅鐞嗗叆搴�
+ if (robotTaskType == RobotTaskTypeEnum.ChangePallet)
{
- // 澶勭悊鍏ュ簱浠诲姟鍥炰紶
- // useSourceAddress: true 琛ㄧず浣跨敤婧愬湴鍧�锛堟媶鐩�/鎹㈢洏鍦烘櫙锛�
+ if (state.ChangePalletPhase == 0)
+ {
+ // 璋冪敤鎵归噺鎷嗙洏纭鎺ュ彛锛堟崲鐩樺彇瀹岄樁娈碉級
+ var sourcePallet = state.CurrentTask.RobotSourceAddressPalletCode;
+ var confirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet);
+ if (!confirmResult.IsSuccess)
+ {
+ QuartzLogger.Error($"鎵归噺鎷嗙洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+ }
+
+ // 鎵�鏈夐樁娈靛畬鎴愶紝澶勭悊鍏ュ簱
+ 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);
+
+ // 閲嶇疆鎵规鐘舵��
+ state.ChangePalletPhase = 0;
+ state.CurrentBatchIndex = 1;
+ state.IsInFakeBatteryMode = false;
+ return true;
+ }
+ }
+ // 涓棿闃舵涓嶅鐞嗭紝浠呮洿鏂扮姸鎬�
+ return true;
+ }
+
+ // 鎷嗙洏浠诲姟锛氱洿鎺ュ鐞嗗叆搴�
+ if (robotTaskType == RobotTaskTypeEnum.SplitPallet)
+ {
+ // 璋冪敤鎵归噺鎷嗙洏纭鎺ュ彛
+ var sourcePallet = state.CurrentTask.RobotSourceAddressPalletCode;
+ var confirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet);
+ if (!confirmResult.IsSuccess)
+ {
+ QuartzLogger.Error($"鎵归噺鎷嗙洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+ }
+
if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
{
// 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
@@ -171,11 +209,57 @@
// 鍒ゆ柇浠诲姟绫诲瀷
var robotTaskType = (RobotTaskTypeEnum)currentTask.RobotTaskType;
- // 鍙湁缁勭洏鎴栨崲鐩樹换鍔￠渶瑕佸鐞嗗叆搴�
- if (robotTaskType == RobotTaskTypeEnum.GroupPallet || robotTaskType == RobotTaskTypeEnum.ChangePallet)
+ // 鎹㈢洏浠诲姟锛氫粎褰撴墍鏈夐樁娈靛畬鎴愭椂鎵嶅鐞嗗叆搴�
+ if (robotTaskType == RobotTaskTypeEnum.ChangePallet)
{
+ if (state.ChangePalletPhase == 0)
+ {
+ // 璋冪敤鎵归噺缁勭洏纭鎺ュ彛锛堟崲鐩樻斁瀹岄樁娈碉級
+ var targetPallet = state.CurrentTask.RobotTargetAddressPalletCode;
+ var confirmResult = _taskProcessor.PostGroupPalletConfirmAsync(targetPallet);
+ if (!confirmResult.IsSuccess)
+ {
+ QuartzLogger.Error($"鎵归噺缁勭洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+ }
+
+ // 鎵�鏈夐樁娈靛畬鎴愶紝澶勭悊鍏ュ簱
+ 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);
+
+ // 閲嶇疆鎵规鐘舵��
+ state.ChangePalletPhase = 0;
+ state.CurrentBatchIndex = 1;
+ state.IsInFakeBatteryMode = false;
+ return true;
+ }
+ }
+ // 涓棿闃舵涓嶅鐞嗭紝浠呮洿鏂扮姸鎬�
+ return true;
+ }
+
+ // 缁勭洏浠诲姟锛氱洿鎺ュ鐞嗗叆搴�
+ if (robotTaskType == RobotTaskTypeEnum.GroupPallet)
+ {
+ // 璋冪敤鎵归噺缁勭洏纭鎺ュ彛
+ var targetPallet = state.CurrentTask.RobotTargetAddressPalletCode;
+ var confirmResult = _taskProcessor.PostGroupPalletConfirmAsync(targetPallet);
+ if (!confirmResult.IsSuccess)
+ {
+ QuartzLogger.Error($"鎵归噺缁勭洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+ }
+
// 澶勭悊鍏ュ簱浠诲姟鍥炰紶
- // useSourceAddress: false 琛ㄧず浣跨敤鐩爣鍦板潃锛堢粍鐩�/鎹㈢洏鍦烘櫙锛�
+ // useSourceAddress: false 琛ㄧず浣跨敤鐩爣鍦板潃锛堢粍鐩樺満鏅級
if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
{
// 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
--
Gitblit v1.9.3