From 29f20b28392d212c04c0c40a512894f8622cfa53 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 16 四月 2025 09:32:01 +0800
Subject: [PATCH] 合并
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index 3bf68c3..268b344 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -256,7 +256,7 @@
}
// 鏌ヨ骞冲彴淇℃伅
- Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
+ Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
if (platform != null && !string.IsNullOrEmpty(platform.Location))
{
if (platform.PlatCode == "1299" || platform.PlatCode == "1295" || platform.PlatCode == "1291" || platform.PlatCode == "1287" || platform.PlatCode == "1283")
@@ -357,8 +357,18 @@
}
else
{
- // 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
- var next = task.NextAddress;
+ if (task.Roadway.Contains("JZ"))
+ {
+ if (StaticVariable.isStackerRun)
+ {
+ StaticVariable.isLineRun = false;
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
+ }
+ else
+ {
+ // 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
+ var next = task.NextAddress;
// 灏嗕换鍔℃槧灏勪负鍛戒护
var taskCommand = MapTaskCommand(task, command);
// 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
@@ -377,6 +387,7 @@
ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
// 鏇存柊浠诲姟鐘舵�佷负涓嬩竴鐘舵��
_taskService.UpdateTaskStatusToNext(task);
+ }
}
}
else
@@ -407,6 +418,10 @@
// 鎹曡幏骞惰緭鍑哄紓甯镐俊鎭�
Console.Out.WriteLine(ex.ToString());
}
+ finally
+ {
+ StaticVariable.isLineRun = true;
+ }
}
public string RequestInboundPlatform(string childDeviceCode, string productLine, bool IsTrayBarcode)
@@ -418,7 +433,7 @@
if (platform != null && !string.IsNullOrEmpty(platform.Location))
{
var Location = platform.Location.Split(',').ToList();
- IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == platform.PLCCode);
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == platform.DeviceCode);
if (device != null)
{
CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
--
Gitblit v1.9.3