Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -60,7 +60,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();
@@ -282,15 +285,15 @@
                    {
                        //报警点位
                        var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcIP.ToString()).ToList();
                        Console.WriteLine("报警点位数:" + listAlarm.Count);
                        //Console.WriteLine("报警点位数:" + listAlarm.Count);
                        var listaddress = new Dictionary<string, PLCDataTypeEnum>();
                        foreach (var modAlarm in listAlarm)
                        {
                            listaddress.Add(modAlarm.AlarmCode, PLCDataTypeEnum.Bit);
                        }
                        Console.WriteLine($"读取点位{listaddress.Count}个");
                        //Console.WriteLine($"读取点位{listaddress.Count}个");
                        var result = modUtil.GetPlcBatchDBValue(listaddress);
                        Console.WriteLine("err" + result.Err);
                        //Console.WriteLine("err" + result.Err);
                        var listPulish = new List<WcsAlarmInfo>();
                        //测试报警
                        //foreach (var modAlarm in listAlarm)
@@ -300,7 +303,7 @@
                        foreach (var item in result.Value)
                        {
                            var value = Convert.ToBoolean(item.Value);
                            Console.WriteLine(item.Key + "+" + value);
                            //Console.WriteLine(item.Key + "+" + value);
                            var modAlarm = listAlarm.FirstOrDefault(s => s.AlarmCode == item.Key);
                            if (value && modAlarm.Status == YesNoEnum.N)
                            {