From dd973f741617e3bbf5ecf11747ff71960991549c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 15 十月 2024 10:21:19 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs | 92 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs b/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
index 7a8ff9c..ad3ab15 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;//鍙栨秷绾跨▼鏍囪瘑
@@ -71,7 +70,7 @@
// 鐢ㄤ簬淇濆瓨姣忎釜璁惧鐨勫垵濮嬬姸鎬�
var initialStates = new Dictionary<long, WcsDeviceOutput>();
- var listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine).ToList();
+ var listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine).Where(s => s.Enable == YesNoEnum.Y).ToList();
var listPlcId = listPlc.Select(s => s.Id).ToList();
var listPlcDevice = _db.Queryable<WcsDevice>().Where(s => s.DeviceType == DeviceTypeEnum.Business && listPlcId.Contains(s.PlcId)).Select<WcsDeviceOutput>().ToList();
var listPlcDeviceId = listPlcDevice.Select(s => s.Id).ToList();
@@ -110,50 +109,91 @@
modDevice.Wcs = Convert.ToString(wcs);
//浠诲姟鍙�
var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
- (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos, modPositionTask.StringLength);
- modDevice.TaskNo = Convert.ToString(taskNo);
+ if (modPositionTask != null)
+ {
+ (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos, modPositionTask.StringLength);
+ modDevice.TaskNo = Convert.ToString(taskNo);
+ }
//浠诲姟绫诲瀷
var modPositionTaskType = listPosition.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
- (result, var taskType) = modConn.GetPlcDBValue(modPositionTaskType.PosType, modDevice.DbNumber, modPositionTaskType.PlcPos);
- modDevice.TaskType = (TaskTypeEnum)Convert.ToInt32(taskType);
+ if (modPositionTaskType != null)
+ {
+ (result, var taskType) = modConn.GetPlcDBValue(modPositionTaskType.PosType, modDevice.DbNumber, modPositionTaskType.PlcPos);
+ modDevice.TaskType = (TaskTypeEnum)Convert.ToInt32(taskType);
+ }
//璧峰宸ヤ綅
var modPositionStartLocatNo = listPosition.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
- (result, var startLocatNo) = modConn.GetPlcDBValue(modPositionStartLocatNo.PosType, modDevice.DbNumber, modPositionStartLocatNo.PlcPos);
- modDevice.StartLocatNo = Convert.ToString(startLocatNo);
+ if (modPositionStartLocatNo != null)
+ {
+ (result, var startLocatNo) = modConn.GetPlcDBValue(modPositionStartLocatNo.PosType, modDevice.DbNumber, modPositionStartLocatNo.PlcPos);
+ modDevice.StartLocatNo = Convert.ToString(startLocatNo);
+ }
//鐩殑宸ヤ綅
var modPositionEndLocatNo = listPosition.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
- (result, var endLocatNo) = modConn.GetPlcDBValue(modPositionEndLocatNo.PosType, modDevice.DbNumber, modPositionEndLocatNo.PlcPos);
- modDevice.EndLocatNo = Convert.ToString(endLocatNo);
+ if (modPositionEndLocatNo != null)
+ {
+ (result, var endLocatNo) = modConn.GetPlcDBValue(modPositionEndLocatNo.PosType, modDevice.DbNumber, modPositionEndLocatNo.PlcPos);
+ modDevice.EndLocatNo = Convert.ToString(endLocatNo);
+ }
//鎵樼洏鐮�
var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
- (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
- modDevice.PalletNo = Convert.ToString(palletNo);
+ if (modPositionPalletNo != null)
+ {
+ (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
+ modDevice.PalletNo = Convert.ToString(palletNo);
+ }
if (modPlc.Type == PLCTypeEnum.ConveyorLine)
{
//鏀捐揣鎺�
var modPositionReleaseRow = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
- (result, var releaseRow) = modConn.GetPlcDBValue(modPositionReleaseRow.PosType, modDevice.DbNumber, modPositionReleaseRow.PlcPos);
- modDevice.ReleaseRow = Convert.ToInt32(releaseRow);
+ if (modPositionReleaseRow != null)
+ {
+ (result, var releaseRow) = modConn.GetPlcDBValue(modPositionReleaseRow.PosType, modDevice.DbNumber, modPositionReleaseRow.PlcPos);
+ modDevice.ReleaseRow = Convert.ToInt32(releaseRow);
+ }
//鏀捐揣鍒�
var modPositionReleaseCol = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
- (result, var releaseCol) = modConn.GetPlcDBValue(modPositionReleaseCol.PosType, modDevice.DbNumber, modPositionReleaseCol.PlcPos);
- modDevice.ReleaseCol = Convert.ToInt32(releaseCol);
+ if (modPositionReleaseCol != null)
+ {
+ (result, var releaseCol) = modConn.GetPlcDBValue(modPositionReleaseCol.PosType, modDevice.DbNumber, modPositionReleaseCol.PlcPos);
+ modDevice.ReleaseCol = Convert.ToInt32(releaseCol);
+ }
//鏀捐揣灞�
var modPositionReleaseStorey = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
- (result, var releaseStorey) = modConn.GetPlcDBValue(modPositionReleaseStorey.PosType, modDevice.DbNumber, modPositionReleaseStorey.PlcPos);
- modDevice.ReleaseStorey = Convert.ToInt32(releaseStorey);
+ if (modPositionReleaseStorey != null)
+ {
+ (result, var releaseStorey) = modConn.GetPlcDBValue(modPositionReleaseStorey.PosType, modDevice.DbNumber, modPositionReleaseStorey.PlcPos);
+ modDevice.ReleaseStorey = Convert.ToInt32(releaseStorey);
+ }
//鍙栬揣鎺�
var modPositionPickRow = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
- (result, var pickRow) = modConn.GetPlcDBValue(modPositionPickRow.PosType, modDevice.DbNumber, modPositionPickRow.PlcPos);
- modDevice.PickRow = Convert.ToInt32(pickRow);
+ if (modPositionPickRow != null)
+ {
+ (result, var pickRow) = modConn.GetPlcDBValue(modPositionPickRow.PosType, modDevice.DbNumber, modPositionPickRow.PlcPos);
+ modDevice.PickRow = Convert.ToInt32(pickRow);
+ }
//鍙栬揣鍒�
var modPositionPickCol = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
- (result, var pickCol) = modConn.GetPlcDBValue(modPositionPickCol.PosType, modDevice.DbNumber, modPositionPickCol.PlcPos);
- modDevice.PickCol = Convert.ToInt32(pickCol);
+ if (modPositionPickCol != null)
+ {
+ (result, var pickCol) = modConn.GetPlcDBValue(modPositionPickCol.PosType, modDevice.DbNumber, modPositionPickCol.PlcPos);
+ modDevice.PickCol = Convert.ToInt32(pickCol);
+ }
//鍙栬揣灞�
var modPositionPickStorey = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
- (result, var pickStorey) = modConn.GetPlcDBValue(modPositionPickStorey.PosType, modDevice.DbNumber, modPositionPickStorey.PlcPos);
- modDevice.PickStorey = Convert.ToInt32(pickStorey);
+ if (modPositionPickStorey != null)
+ {
+ (result, var pickStorey) = modConn.GetPlcDBValue(modPositionPickStorey.PosType, modDevice.DbNumber, modPositionPickStorey.PlcPos);
+ modDevice.PickStorey = Convert.ToInt32(pickStorey);
+ }
+
+ if (modPlc.Type == PLCTypeEnum.StackingMachine)
+ {
+ //璺烘満鐨勮捣濮嬪伐浣嶇敤鍙栬揣鎺掑垪灞�
+ modDevice.StartLocatNo = $"{modDevice.PickRow.ToString()}{modDevice.PickCol.ToString()}{modDevice.PickStorey.ToString()}";
+ //璺烘満鐨勭洰鐨勫伐浣嶇敤鏀捐揣鎺掑垪灞�
+ modDevice.EndLocatNo = $"{modDevice.ReleaseRow.ToString()}{modDevice.ReleaseCol.ToString()}{modDevice.ReleaseStorey.ToString()}";
+ }
}
}
//else
@@ -169,7 +209,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 ||
@@ -185,7 +225,7 @@
modDevice.PickStorey != initialState.PickStorey)))
{
// 閫氱煡鐢ㄦ埛鍙樻洿
- _plcDeviceHubContext.Clients.All.PublicPlcDevice(modDevice);
+ HubUtil.PublicPlcDevice(modDevice);
}
}
initialStates[modDevice.Id] = modDevice.Adapt<WcsDeviceOutput>();
--
Gitblit v1.8.0