From 46229c2a788c1f2a725d5d31225eec5dfa9ce8b4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 26 九月 2024 10:13:41 +0800
Subject: [PATCH] 演示模式错误提示
---
Admin.NET/WCS.Application/Hub/PlcHub.cs | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcHub.cs b/Admin.NET/WCS.Application/Hub/PlcHub.cs
index 1075892..5dc02c2 100644
--- a/Admin.NET/WCS.Application/Hub/PlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcHub.cs
@@ -1,5 +1,6 @@
锘縰sing Furion.InstantMessaging;
using Microsoft.AspNetCore.SignalR;
+using WCS.Application.Entity;
namespace WCS.Application;
@@ -11,10 +12,12 @@
{
private readonly IHubContext<PlcHub, IPlcHub> _plcHubContext;
private readonly SysConfigService _sysConfigService;
- public PlcHub(IHubContext<PlcHub, IPlcHub> plcHubContext, SysConfigService sysConfigService)
+ private readonly SqlSugarRepository<WcsCheckTask> _wcsCheckTaskRep;
+ public PlcHub(IHubContext<PlcHub, IPlcHub> plcHubContext, SysConfigService sysConfigService, SqlSugarRepository<WcsCheckTask> wcsCheckTaskRep)
{
_plcHubContext = plcHubContext;
_sysConfigService = sysConfigService;
+ _wcsCheckTaskRep = wcsCheckTaskRep;
}
/// <summary>
/// 涓嬪彂PLC杩炴帴鐘舵��
@@ -68,6 +71,25 @@
{
PLCTaskAction.boDemo = context.BoDemo.Value;
+ if (PLCTaskAction.boDemo)
+ {
+ //鍒ゆ柇鍒嗘嫞鐮佸灈鏈夋病鏈夌粦瀹氫换鍔�
+ var checkTask = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.Status == "1").ToListAsync();
+ if (checkTask.Count > 0)
+ {
+ await _plcHubContext.Clients.All.UpdateService(
+ new PLCServiceModel()
+ {
+ BoRunningState = PLCTaskAction.boRunningState,
+ BoRefresh = PLCTaskAction.boRefresh,
+ BoOffline = PLCTaskAction.boOffline,
+ BoDemo = PLCTaskAction.boDemo,
+ BoDrumReversal = PLCTaskAction.boDrumReversal,
+ Error = "鍒嗘嫞鐮佸灈宸茬粦瀹氫换鍔★紝涓嶆敮鎸佸紑鍚紨绀烘ā寮忥紒"
+ });
+ return;
+ }
+ }
//PLC杩炴帴
var plcStackeConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == "10.18.51.120");
if (plcStackeConn.Connected)
@@ -108,7 +130,7 @@
PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
}
}
- else
+ else
{
PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
}
@@ -129,4 +151,8 @@
public bool? BoDemo { get; set; }
public bool? BoDrumReversal { get; set; }
+ /// <summary>
+ /// 閿欒淇℃伅
+ /// </summary>
+ public string Error { get; set; }
}
\ No newline at end of file
--
Gitblit v1.8.0