From 504404beedd006d029bb44fe2290aba649795229 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期日, 01 十二月 2024 19:53:39 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index e536cc1..9013f1b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -152,14 +152,25 @@
}
}
}
- if (OutTaskStationIsOccupied(task) != null)
+ else
+ {
+ if (OutTaskStationIsOccupied(task) != null)
+ {
+ return task;
+ }
+ task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+ }
+
+
+ /*if (OutTaskStationIsOccupied(task) != null)
{
return task;
}
else
{
List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
- List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);
+
+ List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode);
foreach (var item in tasks)
{
if (OutTaskStationIsOccupied(task) != null)
@@ -168,9 +179,8 @@
}
}
//task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
- }
+ }*/
}
-
return task;
}
@@ -226,7 +236,7 @@
Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault();
if (tasks != null)
{
- return task;
+ return tasks;
}
else
{
@@ -1058,7 +1068,7 @@
{
StackerCraneTaskCommand stackerCraneTaskCommand = new StackerCraneTaskCommand();
- stackerCraneTaskCommand.Barcode = task.PalletCode;
+ stackerCraneTaskCommand.Barcode = ""; /*task.PalletCode;*/
stackerCraneTaskCommand.TaskNum = task.TaskNum;
stackerCraneTaskCommand.WorkType = 1;
stackerCraneTaskCommand.TrayType = 0;
--
Gitblit v1.9.3