From bb56b2b6f21acb7c69c02585e5bc534d2f67715f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 27 三月 2025 17:13:35 +0800
Subject: [PATCH] WMS首页优化，WCS优化AGV和产线、输送线交互逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
index 6f4ef1c..bdba05a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
@@ -126,11 +126,15 @@
task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
if (task != null)
{
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && !task.SourceIsPickPlace)
+ if (_taskService.TaskOutboundTypes.Contains(task.TaskType) && !task.SourceIsPickPlace)
{
var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//鍑哄簱浠诲姟鍒ゆ柇璧风偣鏄惁鏈夌┛姊溅
- if (ShuttleCar != null) SendTask(task);
- else _taskService.AddRelocationCarTask("", task.SourceAddress);
+ if (ShuttleCar == null) _taskService.AddRelocationCarTask("", task.SourceAddress);
+ else
+ {
+ task.ShuttleCarCode = ShuttleCar.ShuttleCarCode;
+ SendTask(task);
+ }
}
else
SendTask(task);
@@ -246,6 +250,10 @@
// shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
}
}
+ else if (task.TaskType == (int)TaskOtherTypeEnum.RelocationCarCharging)
+ {
+ shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(ShuttleCarTaskType.Charging.ToString());
+ }
else
shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
//shuttleCarTaskCommand.TaskType = string.IsNullOrEmpty(task.Remark) ? (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction) : (short)GetCarTaskType(task.Remark);
@@ -322,14 +330,19 @@
switch (TaskType)
{
case (int)TaskInboundTypeEnum.Inbound:
+ case (int)TaskInboundTypeEnum.PalletInbound:
state = (int)TaskInStatusEnum.Car_InExecuting;
break;
case (int)TaskOutboundTypeEnum.Outbound:
+ case (int)TaskOutboundTypeEnum.PalletOutbound:
state = (int)TaskOutStatusEnum.Car_OutExecuting;
break;
case (int)TaskOtherTypeEnum.RelocationCar:
state = (int)TaskCarStatusEnum.ShuttleCar_Executing;
break;
+ case (int)TaskOtherTypeEnum.RelocationCarCharging:
+ state = (int)CarChargingTaskEnum.ShuttleCar_Charging;
+ break;
default:
break;
}
--
Gitblit v1.9.3