From f423e1277f91427f0a767bd1224c1260dcb73086 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 20 四月 2026 22:47:54 +0800
Subject: [PATCH] feat: 添加空箱入库功能及相关优化
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 34f3e9f..767805f 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
@@ -1,5 +1,6 @@
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.LogHelper;
+using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Tasks.Workflow.Abstractions;
namespace WIDESEAWCS_Tasks.Workflow
@@ -124,6 +125,11 @@
state.BatteryArrived = true;
return true;
+ // 鏄惁鐢佃姱鍒颁綅
+ case "batteryarrivedno":
+ state.BatteryArrived = false;
+ return true;
+
// ==================== 鍏ㄩ儴瀹屾垚鍛戒护 ====================
// 鍏ㄩ儴鍙栬揣瀹屾垚
@@ -158,7 +164,7 @@
if (state.ChangePalletPhase == 5)
{
// FlowB 鏈�缁堥樁娈碉細鍋囩數鑺彇瀹岋紝婧愮┖鎵樼洏鍥炲簱 HCSC1
- if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: "HCSC1"))
{
return false;
}
@@ -184,15 +190,16 @@
{
// FlowA 涓棿闃舵锛氭甯哥數鑺彇瀹岋紝婧愮┖鎵樼洏鍥炲簱 GWSC1
// 涓嶅垹闄や换鍔★紝涓嶉噸缃姸鎬侊紝缁х画 Phase 3-4 鍋囩數鑺祦绋�
- if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: "GWSC1"))
{
return false;
}
return true;
}
+ List<string> str = new List<string>() { "11001", "11010" };
// Phase == 0: 闈炴壒娆℃ā寮忥紙鐩爣鎬绘暟==48锛�
- if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: str.Contains(currentTask.RobotSourceAddressLineCode) ? "GWSC1" : "HCSC1"))
{
return false;
}
@@ -274,7 +281,7 @@
if (state.ChangePalletPhase == 5)
{
// FlowA 鏈�缁堥樁娈碉細鍋囩數鑺斁瀹岋紝鐩爣鎵樼洏婊�48鍏ュ簱 HCSC1
- if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, isRoadway: "HCSC1"))
{
return false;
}
@@ -301,15 +308,16 @@
{
// FlowB 涓棿闃舵锛氭甯哥數鑺斁瀹岋紝鏈夎揣鎵樼洏缁勭洏鍏ュ簱 GWSC1
// 涓嶅垹闄や换鍔★紝涓嶉噸缃姸鎬侊紝缁х画 Phase 3-4 鍋囩數鑺祦绋�
- if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, isRoadway: "GWSC1"))
{
return false;
}
return true;
}
+ List<string> str = new List<string>() { "11001", "11010" };
// Phase == 0: 闈炴壒娆℃ā寮忥紙鐩爣鎬绘暟==48锛�
- if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, str.Contains(currentTask.RobotTargetAddressLineCode) ? "GWSC1" : "HCSC1"))
{
return false;
}
--
Gitblit v1.9.3