解决冲突

hwh

2024-09-02 66da0f6808fa8496a3216c94973a552389ab96ba

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

@@ -14,13 +14,18 @@

    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 IHubContext<PlcHub, IPlcHub> _plcHubContext;

    private static List<WcsPlc> listPlc;
    private static List<WcsDevice> listPlcDevice;
    private static List<WcsPosition> listPlcStation;

    private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
    //对外公布连接状态
    public static List<PLCUtil> listPlcConn
    {
        get { return listPlcUtil; }
    }
    private static CancellationTokenSource cts;//取消线程标识

    public static event EventHandler DeviceValueChangeEvent;
@@ -84,7 +89,7 @@
                    }
                    try
                    {
                        var modPlcUtil = listPlcUtil.FirstOrDefault(s => s.PlcId == modPlc.Id);
                        var modPlcUtil = listPlcUtil.FirstOrDefault(s => s != null && s.PlcId == modPlc.Id);
                        if (modPlcUtil == null)
                        {
                            modPlcUtil = new PLCUtil(modPlc);