hwh
2024-09-18 d5f506ef2f7a9e8feb73e62f57086b5458ffbcbd
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>();
@@ -60,7 +59,10 @@
    public static void Init()
    {
        cts.Cancel();
        listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine).ToList();
        listPlc = _db.Queryable<WcsPlc>()
            .Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine)
            .Where(s => s.Enable == YesNoEnum.Y)
            .ToList();
        listPlcDevice = _db.Queryable<WcsDevice>().ToList();
        listPlcPosition = _db.Queryable<WcsPosition>().ToList();
        listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
@@ -76,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,
@@ -222,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);
@@ -328,7 +330,7 @@
                                listLog.Add(modLog);
                            }
                            _db.Insertable(listLog).ExecuteCommand();
                            _plcHubContext.Clients.All.PublicAlarm(listPulish);
                            HubUtil.PublicAlarm(listPulish);
                        }
                    }
                    catch (Exception ex)
@@ -404,7 +406,7 @@
                                                StationNum = modDevice.StationNum,
                                                BoxHeight = modDevice.BoxHeight
                                            };
                                            _plcHubContext.Clients.All.PublicPosition(modInfo);
                                            HubUtil.PublicPosition(modInfo);
                                            UpdatePosition(modInfo);
                                        }
                                    }
@@ -417,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);
                                        }
                                    }
@@ -427,7 +429,7 @@
                            }
                        }
                    }
                    Thread.Sleep(1000);
                    Thread.Sleep(300);
                }
                catch (Exception ex)
                {