From 6b68425fc633b7d0daee7a43806ee7498998a40f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 11 九月 2024 14:44:14 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs b/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
index ff0eeb4..7a8ff9c 100644
--- a/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
@@ -88,7 +88,8 @@
{
throw new OperationCanceledException();
}
- var modPlc = listPlc.Where(s => s.Id == modDevice.Id).FirstOrDefault();
+ var modPlc = listPlc.Where(s => s.Id == modDevice.PlcId).FirstOrDefault();
+ modDevice.Type = modPlc.Type;
//璇诲彇plc鐨勫��
var modConn = PLCTaskAction.listPlcConn.FirstOrDefault(s => s != null && s.PlcId == modDevice.PlcId);
if (modConn == null)
@@ -155,6 +156,15 @@
modDevice.PickStorey = Convert.ToInt32(pickStorey);
}
}
+ //else
+ //{
+ // //娴嬭瘯
+ // modDevice.TaskNo = "TK00001";
+ // modDevice.TaskType = TaskTypeEnum.In;
+ // modDevice.Wcs = new Random().Next(1000).ToString();
+ // modDevice.Plc = new Random().Next(1000).ToString();
+ // modDevice.Status = true;
+ //}
// 姣旇緝涔嬪墠鐨勭姸鎬�
if (initialStates.TryGetValue(modDevice.Id, out var initialState))
{
@@ -178,17 +188,17 @@
_plcDeviceHubContext.Clients.All.PublicPlcDevice(modDevice);
}
}
-
initialStates[modDevice.Id] = modDevice.Adapt<WcsDeviceOutput>();
-
-
}
Thread.Sleep(2000);
+ }
+ catch (OperationCanceledException)
+ {
+ break;
}
catch (Exception)
{
- throw;
}
}
}, cts.Token);
--
Gitblit v1.8.0