From bdb75323b6c677135d74ff84ac760ca8ea554da4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期四, 17 四月 2025 17:54:22 +0800
Subject: [PATCH] 1
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index 2cf031e..e17e153 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -210,6 +210,7 @@
{
task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
+ _taskService.UpdateData(newTask);
}
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && (task.TargetAddress == "002-071-001" || task.TargetAddress == "001-061-001"))
{
@@ -256,6 +257,32 @@
if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
+ #region 闈欑疆鍑哄簱鍒ゆ柇鏄惁鑳芥墽琛屼换鍔�
+ if (task != null && task.Roadway.Contains("JZ") && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ {
+ // 鏌ヨ鏄惁瀛樺湪闈欑疆鍏ュ簱浠诲姟
+ var inJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
+ (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting ||
+ x.TaskState == (int)TaskInStatusEnum.SC_InExecuting ||
+ x.TaskState == (int)TaskInStatusEnum.Line_InFinish));
+
+ ConsoleHelper.WriteErrorLine($"褰撳墠闈欑疆绾夸綋瀛樺湪鍏ュ簱浠诲姟{inJZTask.Count()}鏉�,{(inJZTask.Count() <= 0 ? "鍙嚭搴�" : "涓嶅彲鍑哄簱")}");
+ WriteInfo(commonStackerCrane.DeviceName, $"褰撳墠闈欑疆绾夸綋瀛樺湪鍏ュ簱浠诲姟{inJZTask.Count()}鏉�,{(inJZTask.Count() <= 0 ? "鍙嚭搴�" : "涓嶅彲鍑哄簱")}");
+ if (inJZTask.Any() || inJZTask.Count() > 0)
+ {
+ var x = inJZTask.Where(x => x.TaskState == (int)TaskInStatusEnum.Line_InFinish).FirstOrDefault();
+ if (x != null)
+ {
+ return x;
+ }
+ else
+ {
+ return null;
+ }
+ }
+ }
+ #endregion
+
// 妫�鏌ュ綋鍓嶅嚭搴撲换鍔＄珯鍙版槸鍚﹀厑璁告斁璐�
var occupiedStation = OutTaskStationIsOccupied(task);
if (occupiedStation == null)
@@ -280,22 +307,7 @@
return task;
}
- #region 闈欑疆鍑哄簱鍒ゆ柇鏄惁鑳芥墽琛屼换鍔�
-
- if (!task.IsNullOrEmpty() && task.Roadway.Contains("JZ") && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- // 鏌ヨ鏄惁瀛樺湪闈欑疆鍏ュ簱浠诲姟
- var inJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
- (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting ||
- x.TaskState == (int)TaskInStatusEnum.SC_InExecuting ||
- x.TaskState == (int)TaskInStatusEnum.Line_InFinish));
-
- ConsoleHelper.WriteErrorLine($"褰撳墠闈欑疆绾夸綋瀛樺湪鍏ュ簱浠诲姟{inJZTask.Count()}鏉�,{(inJZTask.Count() > 0 ? "鍙叆搴�" : "涓嶅彲鍏ュ簱")}");
- if (!inJZTask.IsNullOrEmpty())
- return null;
- }
-
- #endregion 闈欑疆鍑哄簱鍒ゆ柇鏄惁鑳芥墽琛屼换鍔�
+
}
else if (task == null)
{
--
Gitblit v1.9.3