From 6861434f1445d1685b67a24897890c34f8c54f85 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 08 四月 2026 17:22:26 +0800
Subject: [PATCH] WCS&WMS代码更新
---
代码管理/WCS/WCSServers/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneJob.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServers/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServers/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneJob.cs"
index fb0052a..6845aaa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServers/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServers/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneJob.cs"
@@ -1,6 +1,7 @@
锘縰sing Quartz;
using System.Collections.Concurrent;
using System.Net.Sockets;
+using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
@@ -74,7 +75,7 @@
}
// 鑾峰彇褰撳墠闇�涓嬪彂浠诲姟骞剁紦瀛樺埌鐘舵�佷腑
Dt_Task? task = GetTask(Crane);
- if (task != null && state.CurrentTask == null && state.StackerRunMode == (int)StackerModeEnum.Automatic && state.StackerError == (int)StackerErrorEnum.Normal && state.StackerTaskNum == 0)
+ if (task != null && state.CurrentTask == null && state.StackerRunMode== && state.StackerTaskNum == 0)
{
SendStackerTask(task, state);
}
@@ -127,9 +128,9 @@
return _TcpSocket.SendToDeviceAsync(state.IPAddress, message).Result;
}
- private Dt_Task? GetTask(StackerCraneDevice stackerCrane)
+ private Dt_Task? GetTask(StackerCraneDevice stackerCrane, TaskTypeGroup? taskTypeGroup = null)
{
- return null;
+ return _taskService.QueryStackerTask(stackerCrane.DeviceCode,taskTypeGroup);
}
}
@@ -148,12 +149,17 @@
public int? StackerTaskNum { get; set; }
/// <summary>
- /// 鍫嗗灈鏈鸿繍琛屾ā寮�
+ /// 鍫嗗灈鏈鸿繍琛屾ā寮�<br/>
+ /// 1锛氳嚜鍔ㄦā寮�<br/>
+ /// 2锛氬仠姝㈡ā寮�<br/>
+ /// 3锛氭墜鍔ㄦā寮忔垨绂荤嚎妯″紡<br/>
/// </summary>
public int? StackerRunMode { get; set; }
/// <summary>
- /// 鍫嗗灈鏈烘晠闅滅姸鎬�
+ /// 鍫嗗灈鏈烘晠闅滅姸鎬�<br/>
+ /// 姝ｅ父<br/>
+ /// 鏁呴殰<br/>
/// </summary>
public int? StackerError { get; set; }
--
Gitblit v1.9.3