Merge branch 'master' into wxw

wxw

2024-09-04 75a1cfdc9b88519fa7a2af57e8b7d615c063b656

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

@@ -13,6 +13,8 @@
    //自刷新
    public static bool boRefresh = false;

    public static List<PlcPositionInfo> listPositionInfo = new List<PlcPositionInfo>();

    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>>();
@@ -65,6 +67,7 @@
        StartRead();
        ConnectionStatus();
        StartWatchAlarm();
        StartWatchPosition();
    }
    /// <summary>
    /// 开启读取plc线程
@@ -232,11 +235,11 @@
                    var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcId.ToString());
                    foreach (var modAlarm in listAlarm)
                    {
                        (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, modAlarm.AlarmCode, "");
                        (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Bit, modAlarm.AlarmCode, "");
                        if (result.IsSucceed)
                        {
                            //假设不为0就算报警
                            if (value != 0)
                            if (Convert.ToBoolean(value) && modAlarm.Status == YesNoEnum.N)
                            {
                                //修改报警状态同时记录报警日志
                                modAlarm.AlarmTime = DateTime.Now;
@@ -248,7 +251,7 @@
                                _plcHubContext.Clients.All.PublicAlarm(modAlarm.Adapt<WcsAlarmInfoOutput>());
                            }
                            //取消报警
                            else if (modAlarm.Status == YesNoEnum.Y)
                            else if (Convert.ToBoolean(value) && modAlarm.Status == YesNoEnum.Y)
                            {
                                modAlarm.AlarmTime = null;
                                modAlarm.Status = YesNoEnum.N;
@@ -263,6 +266,101 @@
        }, cts.Token);
    }
    /// <summary>
    /// 开启位置监控
    /// </summary>
    public static void StartWatchPosition()
    {
        Task.Run(() =>
        {
            while (true)
            {
                //取消线程 关闭PLC连接
                if (cts.Token.IsCancellationRequested)
                {
                    foreach (var modPlcUtil in listPlcUtil)
                    {
                        if (modPlcUtil != null && modPlcUtil.Connected)
                            modPlcUtil.Close();
                    }
                    break;
                    //throw new OperationCanceledException();
                }
                try
                {
                    foreach (var modPlcUtil in listPlcUtil)
                    {
                        if (modPlcUtil == null)
                            break;
                        var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId && s.DeviceType == DeviceTypeEnum.Show).ToList();
                        foreach (var modDevice in listDevice)
                        {
                            var modPlc = listPlc.FirstOrDefault(s => s.Id == modDevice.PlcId);
                            (var result, var value) = modPlcUtil.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
                            if (result.IsSucceed)
                            {
                                if (modPlc.Type == PLCTypeEnum.ConveyorLine)
                                {
                                    //假设不为0就算有东西
                                    if (value != 0 && !modDevice.BoHaveItem)
                                    {
                                        modDevice.BoHaveItem = true;
                                        //下发状态
                                        var modInfo = new PlcPositionInfo() { StationNum = modDevice.StationNum, BoHaveItem = true };
                                        _plcHubContext.Clients.All.PublicPosition(modInfo);
                                        UpdatePosition(modInfo);
                                    }
                                    else if (value == 0 && modDevice.BoHaveItem)
                                    {
                                        modDevice.BoHaveItem = false;
                                        //下发状态
                                        var modInfo = new PlcPositionInfo()
                                        {
                                            StationNum = modDevice.StationNum,
                                            BoHaveItem = false,
                                            Type = modPlc.Type,
                                        };
                                        _plcHubContext.Clients.All.PublicPosition(modInfo);
                                        UpdatePosition(modInfo);
                                    }
                                }
                                else if (modPlc.Type == PLCTypeEnum.StackingMachine)
                                {
                                    //todo:这里的高度可能需要前端展示值和plc的值进行一个换算
                                    var BoxHeight = Convert.ToInt32(value);
                                    if (value != 0 && modDevice.BoxHeight != BoxHeight)
                                    {
                                        modDevice.BoxHeight = BoxHeight;
                                        //下发状态
                                        var modInfo = new PlcPositionInfo() { StationNum = modDevice.StationNum, BoxHeight = BoxHeight };
                                        _plcHubContext.Clients.All.PublicPosition(modInfo);
                                        UpdatePosition(modInfo);
                                    }
                                }
                            }

                        }
                    }
                }
                catch (Exception)
                {

                }
            }
        });
    }
    private static void UpdatePosition(PlcPositionInfo modInfo)
    {
        var modTemp = listPositionInfo.FirstOrDefault(s => s.StationNum == modInfo.StationNum);
        if (modTemp == null)
        {
            listPositionInfo.Add(modInfo);
        }
        else
        {
            modTemp.BoHaveItem = modInfo.BoHaveItem;
        }
    }
    /// <summary>
    /// 停止服务
    /// </summary>
    public static void Stop()