From c388f1acccd0b7e76a4366fbaddaca6551826b74 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 05 二月 2026 10:29:07 +0800
Subject: [PATCH] 添加拘束/插拔钉机和堆垛机基类
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index ee38b1e..37cefb6 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -46,7 +46,7 @@
Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " CommonStackerCraneJob Start");
bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
- if (!flag || value is not CommonStackerCrane commonStackerCrane)
+ if (!flag || value is not IStackerCrane commonStackerCrane)
{
return Task.CompletedTask;
}
@@ -56,16 +56,10 @@
commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;
}
- if (commonStackerCrane.StackerCraneAutoStatusValue != StackerCraneAutoStatus.Automatic
- || commonStackerCrane.StackerCraneStatusValue != StackerCraneStatus.Normal)
+ if (commonStackerCrane.IsCanSendTask(commonStackerCrane.Communicator, commonStackerCrane.DeviceProDTOs, commonStackerCrane.DeviceProtocolDetailDTOs))
{
- return Task.CompletedTask;
- }
+ commonStackerCrane.CheckStackerCraneTaskCompleted();
- commonStackerCrane.CheckStackerCraneTaskCompleted();
-
- if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
- {
Dt_Task? task = GetTask(commonStackerCrane);
if (task != null)
{
@@ -113,7 +107,7 @@
/// </summary>
/// <param name="commonStackerCrane">鍫嗗灈鏈哄璞�</param>
/// <returns></returns>
- private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
+ private Dt_Task? GetTask(IStackerCrane commonStackerCrane)
{
Dt_Task? task = null;
if (commonStackerCrane.LastTaskType == null)
@@ -310,4 +304,4 @@
&& short.TryParse(parts[2], out layer);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3