From d9c99e0480b4910cdb134778dd5c314b35ec4cf2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 九月 2025 10:05:23 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 1066bcb..f301a7c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -42,10 +42,10 @@
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
private readonly ITaskRepository _taskRepository;
private readonly IRouterService _routerService;
- private readonly IShuttleCarService _shuttleCarService;
+ private readonly WIDESEAWCS_IShuttleCar.IShuttleCarService _shuttleCarService;
private readonly ICacheService _cacheService;
- public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IShuttleCarService shuttleCarService, ICacheService cacheService)
+ public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, WIDESEAWCS_IShuttleCar.IShuttleCarService shuttleCarService, ICacheService cacheService)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -73,7 +73,7 @@
#endregion
#region 浠诲姟瀹屾垚
- if (common.CompleteStatus == 2 || common.CompleteStatus == 3 || common.CompleteStatus == 4)
+ if ((common.CompleteStatus == 2 || common.CompleteStatus == 3 || common.CompleteStatus == 4) && commonStackerCrane.CurrentTaskNum > 0)
{
var remark = "姝ｅ父瀹屾垚";
if (common.CompleteStatus == 2) remark = "鎵嬪姩瀹屾垚";
@@ -87,7 +87,7 @@
if (common.Onlinestate == (short)Onlinestate.online)
{
#region 鏌ヨ浠诲姟,閫昏緫澶勭悊
- if (common.RunStatus == (short)RunStatus.Standby)
+ if (common.RunStatus == (short)RunStatus.Standby && common.WriteStatus == (short)WriteStatus.Permit)
{
#region 绌挎杞︾Щ杞�/鍏呯數浠诲姟
var Task = _taskService.GetTaskState((int)CarChargingTaskEnum.CarCharging_Finish, (int)TaskOtherTypeEnum.RelocationCarCharging) ??
@@ -125,6 +125,7 @@
{
if (commonStackerCrane.SetValue(StackerCraneDBName.CommandSend, sendFlag))
{
+ WriteDebug($"{commonStackerCrane.DeviceName}鎺ユ敹浠诲姟", $"WCS涓嬪彂浠诲姟,浠诲姟鍙枫�恵task.TaskNum}銆�");
if (_taskService.TaskInboundTypes.Contains(task.TaskType) ||
_taskService.TaskOutboundTypes.Contains(task.TaskType))
commonStackerCrane.LastTaskType = task.TaskType;
--
Gitblit v1.9.3