From 3d2f1d836cd271a51f0c02b99f538070a783139d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 23 九月 2024 08:17:15 +0800
Subject: [PATCH] 增加WCS接受WMS下发任务的方法
---
Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs b/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
index f4ef73a..7a2c8ff 100644
--- a/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
@@ -16,7 +16,6 @@
[MapHub("/hubs/PlcDevice")]
public class PlcDeviceHub : Hub<IPlcDeviceHub>
{
- private static readonly IHubContext<PlcDeviceHub, IPlcDeviceHub> _plcDeviceHubContext = App.GetService<IHubContext<PlcDeviceHub, IPlcDeviceHub>>();
private static readonly SysCacheService _sysCacheService = App.GetRequiredService<SysCacheService>();
private static bool boRunningState = false;
private static CancellationTokenSource cts;//鍙栨秷绾跨▼鏍囪瘑
@@ -142,7 +141,6 @@
{
(result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
modDevice.PalletNo = Convert.ToString(palletNo);
- Console.WriteLine(modDevice.DbNumber + "." + modPositionPalletNo.PlcPos + "----------");
}
if (modPlc.Type == PLCTypeEnum.ConveyorLine)
{
@@ -204,7 +202,7 @@
if (initialStates.TryGetValue(modDevice.Id, out var initialState))
{
if (modDevice.Status != initialState.Status ||
- modDevice.Plc != initialState.Plc ||
+ (modDevice.Plc.IsNullOrEmpty() && modDevice.Plc != initialState.Plc) ||
modDevice.Wcs != initialState.Wcs ||
modDevice.TaskNo != initialState.TaskNo ||
modDevice.TaskType != initialState.TaskType ||
@@ -220,7 +218,7 @@
modDevice.PickStorey != initialState.PickStorey)))
{
// 閫氱煡鐢ㄦ埛鍙樻洿
- _plcDeviceHubContext.Clients.All.PublicPlcDevice(modDevice);
+ HubUtil.PublicPlcDevice(modDevice);
}
}
initialStates[modDevice.Id] = modDevice.Adapt<WcsDeviceOutput>();
--
Gitblit v1.8.0