From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PP仓/TSJConveyorLineJob_PP.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PP\344\273\223/TSJConveyorLineJob_PP.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PP\344\273\223/TSJConveyorLineJob_PP.cs"
index 854306d..1742b4d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PP\344\273\223/TSJConveyorLineJob_PP.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PP\344\273\223/TSJConveyorLineJob_PP.cs"
@@ -102,7 +102,6 @@
if (conveyorLineSignalRead.STB)
{
device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
-
Thread.Sleep(500);
device.SetValue(W_ConveyorLineDB.ACK, false, item.StationCode);
_taskService.TaskCompleted(conveyorLineInfoRead.TaskNum);
@@ -110,6 +109,7 @@
}
else if (item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt())
{
+ //鍒ゆ柇绌轰腑杩炲粖鍑哄簱绌洪棽
if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && !conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !conveyorLineSignalWrite.STB && !conveyorLineSignalWrite.ACK)
{
Dt_Task task = _taskRepository.QueryFirst(x => _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.DeviceCode == item.StackerCraneCode && x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && !string.IsNullOrEmpty(x.NextAddress));
@@ -148,6 +148,7 @@
}
else
{
+ #region 鍑哄簱
if (!conveyorLineSignalWrite.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Goods)
{
Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() && x.DeviceCode == item.StationDeviceCode);
@@ -181,6 +182,7 @@
_taskService.TaskCompleted(conveyorLineInfoRead.TaskNum);
device.SetValue(W_ConveyorLineDB.STB, false, item.StationCode);
}
+ #endregion
}
}
else if (item.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt())
--
Gitblit v1.9.3