From a8756c3526832332db4ef5685348d9b188c2bf2b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 13 九月 2025 08:36:44 +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 | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 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..81096e3 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())
@@ -217,6 +219,50 @@
{
WriteInfo(device.DeviceName, $"鏈壘鍒拌澶囧瓙缂栧彿{item.StationCode}鐨勫崗璁俊鎭�");
}
+ R_ConveyorLineInfo conveyorLineInfoRead1 = device.Communicator.ReadCustomer<R_ConveyorLineInfo>(deviceProRead.DeviceProAddress);
+ W_ConveyorLineInfo conveyorLineInfoWrite1 = device.Communicator.ReadCustomer<W_ConveyorLineInfo>(deviceProWrite.DeviceProAddress);
+ R_ConveyorLineStatus conveyorLineStatus1 = conveyorLineInfoRead1.Status.ByteToBoolObject<R_ConveyorLineStatus>();
+ ConveyorLineSignal conveyorLineSignalRead1 = conveyorLineInfoRead1.Signal.ByteToBoolObject<ConveyorLineSignal>();
+ ConveyorLineSignal conveyorLineSignalWrite1 = conveyorLineInfoWrite1.Signal.ByteToBoolObject<ConveyorLineSignal>();
+ if (item.StationCode == "2005")
+ {
+ if (conveyorLineSignalRead1.STB && conveyorLineStatus1.Online && conveyorLineStatus1.Goods && !conveyorLineStatus1.Alarm && !conveyorLineSignalWrite1.ACK)
+ {
+ StackerCraneJob_PP.pPReadData.R_PP_Boxcode = device.Communicator.Read<string>("DB900.578.0");
+ }
+ StackerCraneJob_PP.pPReadData.R_PP_HandShake5 = conveyorLineStatus1.HandShake;
+ StackerCraneJob_PP.pPReadData.R_PP_Online5 = conveyorLineStatus1.Online;
+ StackerCraneJob_PP.pPReadData.R_PP_Free5 = conveyorLineStatus1.Free;
+ StackerCraneJob_PP.pPReadData.R_PP_Goods5 = conveyorLineStatus1.Goods;
+ StackerCraneJob_PP.pPReadData.R_PP_Alarm5 = conveyorLineStatus1.Alarm;
+ StackerCraneJob_PP.pPReadData.R_PP_STB5 = conveyorLineSignalRead1.STB;
+ StackerCraneJob_PP.pPReadData.R_PP_ACK5 = conveyorLineSignalRead1.ACK;
+ StackerCraneJob_PP.pPReadData.W_PP_STB5 = conveyorLineSignalWrite1.STB;
+ StackerCraneJob_PP.pPReadData.W_PP_ACK5 = conveyorLineSignalWrite1.ACK;
+ }else if(item.StationCode == "2016")
+ {
+ StackerCraneJob_PP.pPReadData.R_PP_HandShake6 = conveyorLineStatus1.HandShake;
+ StackerCraneJob_PP.pPReadData.R_PP_Online6 = conveyorLineStatus1.Online;
+ StackerCraneJob_PP.pPReadData.R_PP_Free6 = conveyorLineStatus1.Free;
+ StackerCraneJob_PP.pPReadData.R_PP_Goods6 = conveyorLineStatus1.Goods;
+ StackerCraneJob_PP.pPReadData.R_PP_Alarm6 = conveyorLineStatus1.Alarm;
+ StackerCraneJob_PP.pPReadData.R_PP_STB6 = conveyorLineSignalRead1.STB;
+ StackerCraneJob_PP.pPReadData.R_PP_ACK6 = conveyorLineSignalRead1.ACK;
+ StackerCraneJob_PP.pPReadData.W_PP_STB6 = conveyorLineSignalWrite1.STB;
+ StackerCraneJob_PP.pPReadData.W_PP_ACK6 = conveyorLineSignalWrite1.ACK;
+ }
+ else if (item.StationCode == "2016")
+ {
+ StackerCraneJob_PP.pPReadData.R_PP_HandShake7 = conveyorLineStatus1.HandShake;
+ StackerCraneJob_PP.pPReadData.R_PP_Online7 = conveyorLineStatus1.Online;
+ StackerCraneJob_PP.pPReadData.R_PP_Free7 = conveyorLineStatus1.Free;
+ StackerCraneJob_PP.pPReadData.R_PP_Goods7 = conveyorLineStatus1.Goods;
+ StackerCraneJob_PP.pPReadData.R_PP_Alarm7 = conveyorLineStatus1.Alarm;
+ StackerCraneJob_PP.pPReadData.R_PP_STB7 = conveyorLineSignalRead1.STB;
+ StackerCraneJob_PP.pPReadData.R_PP_ACK7 = conveyorLineSignalRead1.ACK;
+ StackerCraneJob_PP.pPReadData.W_PP_STB7 = conveyorLineSignalWrite1.STB;
+ StackerCraneJob_PP.pPReadData.W_PP_ACK7 = conveyorLineSignalWrite1.ACK;
+ }
}
}
--
Gitblit v1.9.3