From 29f20b28392d212c04c0c40a512894f8622cfa53 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 16 四月 2025 09:32:01 +0800
Subject: [PATCH] 合并
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index 61f5dc5..2cf031e 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -73,7 +73,20 @@
if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
{
- Dt_Task? task = GetTask(commonStackerCrane);
+ Dt_Task? task = null;
+ if (commonStackerCrane.DeviceName.Contains("闈欑疆"))
+ {
+ if (StaticVariable.isLineRun)
+ {
+ StaticVariable.isStackerRun = false;
+ task = GetTask(commonStackerCrane);
+ }
+ }
+ else
+ {
+ task = GetTask(commonStackerCrane);
+ }
+
if (task != null)
{
StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
@@ -142,7 +155,10 @@
ConsoleHelper.WriteErrorLine($"{ex.Message}");
//Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
}
- //WriteDebug("CommonConveyorLineJob", "test");
+ finally
+ {
+ StaticVariable.isStackerRun = true;
+ }
return Task.CompletedTask;
}
@@ -195,7 +211,7 @@
task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
}
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && (task.TargetAddress == "002-021-001" || task.TargetAddress == "001-021-001"))
+ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && (task.TargetAddress == "002-071-001" || task.TargetAddress == "001-061-001"))
{
var TASKHTY = task.Adapt<Dt_Task_Hty>();
_taskRepository.DeleteData(task);
@@ -342,7 +358,7 @@
}
else
{
- if ((task.NextAddress == ("002-071-001") || task.NextAddress == ("001-071-001")) && task.Roadway.Contains("CH"))
+ if ((task.NextAddress == ("002-071-001") || task.NextAddress == ("001-061-001")) && (task.Roadway.Contains("CH")|| task.Roadway.Contains("JZ")))
{
return task;
}
@@ -502,7 +518,7 @@
}
else
{
- if ((task.TargetAddress == "002-061-001" || task.TargetAddress == "001-061-001") && task.Roadway.Contains("JZ"))
+ if ((task.TargetAddress == "002-071-001" || task.TargetAddress == "001-061-001") && (task.Roadway.Contains("JZ") || task.Roadway.Contains("CH")))
{
string[] endCodes = task.NextAddress.Split("-");
stackerCraneTaskCommand.EndRow = Convert.ToInt16(endCodes[0]);
--
Gitblit v1.9.3