From e2a5657e3a0b8615bcd78a3149e5ba9ce5579bb8 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 02 十二月 2024 16:25:35 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 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..84ea5c9 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
{
@@ -592,7 +602,14 @@
{
return true;
}
-
+ }
+ DeviceProDTO? deviceProDTO6 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_A2in"); //绌烘墭鍑哄叆搴�
+ if (deviceProDTO6 != null)
+ {
+ if (GetStacker(commonStackerCrane, deviceProDTO6.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
return false;
@@ -642,6 +659,15 @@
if (deviceProDTO != null)
{
if(SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
+ }
+ }
+
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_A2in");
+ if (deviceProDTO != null)
+ {
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -709,7 +735,17 @@
}
}
}
-
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_A2in");
+ if (deviceProDTO != null)
+ {
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
+ }
+ }
return false;
}
@@ -758,7 +794,14 @@
if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
-
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_A2in");
+ if (deviceProDTO != null)
+ {
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
+ }
+ }
return false;
}
@@ -1058,7 +1101,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