自刷新功能

hwh

2024-09-18 d5f506ef2f7a9e8feb73e62f57086b5458ffbcbd

自刷新功能

 Admin.NET/WCS.Application/Hub/HubUtil.cs

New file
@@ -0,0 +1,88 @@
using Microsoft.AspNetCore.SignalR;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace WCS.Application;
public static class HubUtil
{
    private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
    private static readonly IHubContext<PlcDeviceHub, IPlcDeviceHub> _plcDeviceHubContext = App.GetService<IHubContext<PlcDeviceHub, IPlcDeviceHub>>();
    private static readonly IHubContext<TaskLogHub, ITaskLogHub> _taskLogHubContext = App.GetService<IHubContext<TaskLogHub, ITaskLogHub>>();

    /// <summary>
    /// 下发PLC连接状态
    /// </summary>
    /// <param name="context"></param>
    /// <returns></returns>
    public static async Task PublicPlcConn(WcsPlc context)
    {
        if (PLCTaskAction.boRefresh)
            await _plcHubContext.Clients.All.PublicPlcConn(context);
    }

    /// <summary>
    /// 下发报警信息
    /// </summary>
    /// <param name="context"></param>
    /// <returns></returns>
    public static async Task PublicAlarm(List<WcsAlarmInfo> context)
    {
        if (PLCTaskAction.boRefresh)
            await _plcHubContext.Clients.All.PublicAlarm(context);
    }

    /// <summary>
    /// 修改服务状态
    /// </summary>
    /// <param name="context"></param>
    public static async Task UpdateService(PLCServiceModel context)
    {
        if (PLCTaskAction.boRefresh)
            await _plcHubContext.Clients.All.UpdateService(context);
    }

    /// <summary>
    /// 下发控制台位置信息
    /// </summary>
    /// <param name="context"></param>
    /// <returns></returns>
    public static async Task PublicPosition(PlcPositionInfo context)
    {
        if (PLCTaskAction.boRefresh)
            await _plcHubContext.Clients.All.PublicPosition(context);
    }

    /// <summary>
    /// 下发任务
    /// </summary>
    /// <returns></returns>
    public static async Task PublicTask(WcsTaskOutput context)
    {
        if (PLCTaskAction.boRefresh)
            await _taskLogHubContext.Clients.All.PublicTask(context);
    }

    /// <summary>
    /// 下发任务明细
    /// </summary>
    /// <returns></returns>
    public static async Task PublicTaskMonitor(WcsTaskMonitorOutput context)
    {
        if (PLCTaskAction.boRefresh)
            await _taskLogHubContext.Clients.All.PublicTaskMonitor(context);
    }

    /// <summary>
    /// 下发设备信息
    /// </summary>
    /// <param name="context"></param>
    /// <returns></returns>
    public static async Task PublicPlcDevice(WcsDeviceOutput context)
    {
        if (PLCTaskAction.boRefresh)
            await _plcDeviceHubContext.Clients.All.PublicPlcDevice(context);
    }
}

 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;//取消线程标识
@@ -219,7 +218,7 @@
                                     modDevice.PickStorey != initialState.PickStorey)))
                            {
                                // 通知用户变更
                                _plcDeviceHubContext.Clients.All.PublicPlcDevice(modDevice);
                                HubUtil.PublicPlcDevice(modDevice);
                            }
                        }
                        initialStates[modDevice.Id] = modDevice.Adapt<WcsDeviceOutput>();

 Admin.NET/WCS.Application/PLC/PLCService.cs

@@ -15,12 +15,6 @@
public static class PLCService
{
    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
    private static readonly IHubContext<TaskLogHub, ITaskLogHub> _taskLogHubContext;

    static PLCService()
    {
        _taskLogHubContext = App.GetService<IHubContext<TaskLogHub, ITaskLogHub>>();
    }

    public static void OnChangeEvent(object sender, EventArgs e)
    {
@@ -148,7 +142,7 @@
                            .SetColumns(s => s.Status == TaskStatusEnum.Doing)
                            .Where(s => s.Id == modTask.Id)
                            .ExecuteCommand();
                        _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
                        HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
                        WcsTaskMonitor modInsertTaskMonitor;
                        if (string.IsNullOrEmpty(taskInfo.EndStation))
                        {
@@ -184,7 +178,7 @@
                        // 插入交互日志
                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                        //下发任务日志
                        _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        //修改led屏信息
                        //LedDisplay(modDevice.LedIP, "工位:" + modTask.EndLocate, "出库中 " + $"储位地址：{modTask.StartLocate}", "托盘号:" + modTask.PalletNo);
                    }
@@ -251,7 +245,7 @@
                                        // 插入交互日志
                                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                                        //下发任务日志
                                        _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                        break;
                                    }

@@ -259,7 +253,7 @@
                                    // 插入交互日志
                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
                                    //下发任务日志
                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                    HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                }

                                // 写入流程控制字
@@ -274,7 +268,7 @@
                                                                                                    // 插入交互日志
                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                                //下发任务日志
                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            }
                        }
                        else if (modTask.TaskType == TaskTypeEnum.Out)
@@ -306,7 +300,7 @@
                        // 插入交互日志
                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                        //下发任务日志
                        _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        //修改led屏信息
                        //LedDisplay(modDevice.LedIP, "工位:" + modTask.EndLocate, "出库中 " + $"储位地址：{modTask.StartLocate}", "托盘号:" + modTask.PalletNo);
                    }
@@ -343,8 +337,8 @@
                                    modTask.Status = TaskStatusEnum.Complete;
                                    modTask.FinishDate = DateTime.Now;
                                    _db.Updateable(modTask).ExecuteCommand();
                                    _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
                                    var modcTaskMonitor = new WcsTaskMonitor()
                                    HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
                                    var modTaskMonitor = new WcsTaskMonitor()
                                    {
                                        TaskNo = modTask.TaskNo,
                                        PlcId = modDevice.Id,
@@ -369,13 +363,13 @@
                                        var modResponseTask = httpService.RequestTask(requestMode).Result;
                                        if (modResponseTask.StatusCode == "0")
                                        {
                                            modcTaskMonitor.InteractiveMsg = "任务完成，返回给WMS任务完成";
                                            modTaskMonitor.InteractiveMsg = "任务完成，返回给WMS任务完成";
                                        }
                                    }
                                    // 插入交互日志
                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
                                    _db.Insertable(modTaskMonitor).ExecuteCommand();
                                    //下发任务日志
                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                    HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());

                                    // 此处添加不空跑业务
                                }
@@ -440,7 +434,7 @@
                                                    // 插入交互日志
                                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
                                                    //下发任务日志
                                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                                    HubUtil.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                                    break;
                                                }
                                            }
@@ -469,8 +463,7 @@
                                    modTask.FinishDate = DateTime.Now;
                                    _db.Updateable(modTask).ExecuteCommand();
                                    //下发任务日志
                                    _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());

                                    HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
                                    var modcTaskMonitor = new WcsTaskMonitor()
                                    {
                                        TaskNo = modTask.TaskNo,
@@ -504,7 +497,7 @@
                                    // 插入交互日志
                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
                                    //下发任务日志
                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                    HubUtil.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());

                                    // 此处添加不空跑业务
                                }
@@ -538,7 +531,7 @@
                        break;
                    modTask.Status = TaskStatusEnum.Exception;
                    _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
                    _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
                    HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
                    Log.Information($"【堆垛机】wcs任务变更空取异常，任务号：{modTask.TaskNo}");
                    var modTaskRequest = modTask.Adapt<TaskRequest>();
                    HttpService httpService = new HttpService();
@@ -549,7 +542,7 @@
                        modTask.IsSuccess = TaskSuccessEnum.Success;
                        _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
                        //下发任务日志
                        _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
                        HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
                    }
                    else
                    {
@@ -557,7 +550,7 @@
                        modTask.IsSuccess = TaskSuccessEnum.Fail;
                        modTask.Information = modResponseTask.Message;
                        _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
                        _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
                        HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
                    }
                }
                break;
@@ -578,7 +571,7 @@
                    }
                    modTask.Status = TaskStatusEnum.Exception;
                    _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
                    _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
                    HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
                    Log.Information($"【堆垛机】wcs任务变更满取异常，任务号：{modTask.TaskNo}");
                    var modTaskRequest = modTask.Adapt<TaskRequest>();
                    HttpService httpService = new HttpService();
@@ -632,7 +625,7 @@
                            // 插入交互日志
                            _db.Insertable(modcTaskMonitor).ExecuteCommand();
                            //下发任务日志
                            _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            HubUtil.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        }

                    }
@@ -705,10 +698,7 @@
                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();

                            // 通知任务界面任务已存在更新 请更新界面
                            if (PLCTaskAction.boRefresh)
                            {
                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            }
                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            // led更新内容
                            //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and  StationNum = '{EndLocat}'")[0];
                            //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "工位:" + EndLocat, "出库中 " + $"储位地址：{StartLocat}", "托盘号:" + PalletNo);
@@ -792,10 +782,7 @@
                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();

                            // 通知任务界面任务已存在更新 请更新界面
                            if (PLCTaskAction.boRefresh)
                            {
                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            }
                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());

                            // led更新内容
                            //LedDisplay(modDevice.LedIP, "工位:" + modTask.EndLocate, "出库中 " + $"储位地址：{modTask.StartLocate}", "托盘号:" + modTask.PalletNo);
@@ -857,10 +844,7 @@
                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();

                            // 通知任务界面任务已存在更新 请更新界面
                            if (PLCTaskAction.boRefresh)
                            {
                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            }
                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            // led更新内容
                            //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and  StationNum = '{EndLocat}'")[0];
                            //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "工位:" + EndLocat, "出库中 " + $"储位地址：{StartLocat}", "托盘号:" + PalletNo);
@@ -988,7 +972,7 @@
                                // 插入交互日志
                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                                //下发任务日志
                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                break;

                            }
@@ -996,8 +980,9 @@
                            // 插入交互日志
                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                            if (PLCTaskAction.boRefresh)
                            {   //下发任务日志
                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            {
                                //下发任务日志
                                HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            }
                            
                        }
@@ -1045,10 +1030,7 @@
                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();

                        // 通知任务界面任务已存在更新 请更新界面
                        if (PLCTaskAction.boRefresh)
                        {
                            _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        }
                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                         
                        // led更新内容
                        //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and  StationNum = '{EndLocat}'")[0];
@@ -1093,10 +1075,7 @@
                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();

                        // 通知任务界面任务已存在更新 请更新界面
                        if (PLCTaskAction.boRefresh)
                        {
                            _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        }
                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        // led更新内容
                        //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and  StationNum = '{EndLocat}'")[0];
                        //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "工位:" + EndLocat, "出库中 " + $"储位地址：{StartLocat}", "托盘号:" + PalletNo);

 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs

@@ -20,7 +20,6 @@

    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
    private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
    private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
    private static readonly SysConfigService _sysConfigService = App.GetService<SysConfigService>();

    private static List<WcsPlc> listPlc = new List<WcsPlc>();
@@ -79,7 +78,7 @@
            var plc = new PLCUtil(modPlc);
            listPlcUtil.Add(plc);
        }
        _plcHubContext.Clients.All.UpdateService(new PLCServiceModel()
        HubUtil.UpdateService(new PLCServiceModel()
        {
            BoRunningState = boRunningState,
            BoOffline = boOffline,
@@ -225,14 +224,14 @@
                            {
                                //连接状态变更 通知前端
                                Console.WriteLine($"通知前端变更{modPlc.Text} {modPlc.IsConn}");
                                _plcHubContext.Clients.All.PublicPlcConn(modPlc);
                                HubUtil.PublicPlcConn(modPlc);
                            }
                            sysCacheService.Set("PLCCONN:" + modPlc.Id, modPlc);
                        }
                        else
                        {
                            sysCacheService.Set("PLCCONN:" + modPlc.Id, modPlc);
                            _plcHubContext.Clients.All.PublicPlcConn(modPlc);
                            HubUtil.PublicPlcConn(modPlc);
                        }
                    }
                    Thread.Sleep(1000);
@@ -331,7 +330,7 @@
                                listLog.Add(modLog);
                            }
                            _db.Insertable(listLog).ExecuteCommand();
                            _plcHubContext.Clients.All.PublicAlarm(listPulish);
                            HubUtil.PublicAlarm(listPulish);
                        }
                    }
                    catch (Exception ex)
@@ -407,7 +406,7 @@
                                                StationNum = modDevice.StationNum,
                                                BoxHeight = modDevice.BoxHeight
                                            };
                                            _plcHubContext.Clients.All.PublicPosition(modInfo);
                                            HubUtil.PublicPosition(modInfo);
                                            UpdatePosition(modInfo);
                                        }
                                    }
@@ -420,7 +419,7 @@
                                            modDevice.BoHaveItem = value;
                                            //下发状态
                                            var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum, BoHaveItem = value };
                                            _plcHubContext.Clients.All.PublicPosition(modInfo);
                                            HubUtil.PublicPosition(modInfo);
                                            UpdatePosition(modInfo);
                                        }
                                    }

 Admin.NET/WCS.Application/WCS.Application.csproj

@@ -2,7 +2,7 @@

  <PropertyGroup>
      <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
      <NoWarn>1701;1702;1591;8632</NoWarn>
      <NoWarn>1701;1702;1591;8632;4014</NoWarn>
      <DocumentationFile></DocumentationFile>
      <ImplicitUsings>enable</ImplicitUsings>
      <GenerateDocumentationFile>True</GenerateDocumentationFile>