.新框架wcs
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
hwh
2024-10-16 3c09e83246ac9866f6a38b1739436f0833565e1f 
 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs


@@ -293,26 +293,18 @@


                    {


                        //报警点位


                        var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcIP.ToString()).ToList();


                        //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}个");


                        var result = modUtil.GetPlcBatchDBValue(listaddress);


                        //Console.WriteLine("err" + result.Err);


                        var listPulish = new List<WcsAlarmInfo>();


                        //测试报警


                        //foreach (var modAlarm in listAlarm)


                        //{


                        //    result.Value.Add(modAlarm.AlarmCode, true);


                        //}


                        foreach (var item in result.Value)


                        {


                            var value = Convert.ToBoolean(item.Value);


                            //Console.WriteLine(item.Key + "+" + value);


                            var modAlarm = listAlarm.FirstOrDefault(s => s.AlarmCode == item.Key);


                            var stationNum = modAlarm.StationNum;


                            if (value && modAlarm.Status == YesNoEnum.N)


                            {


                                //修改报警状态同时记录报警日志


@@ -380,7 +372,7 @@


                        if (modPlcUtil == null)


                            continue;


                        var plcIp = modPlcUtil.PlcIP;


                        var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId ).ToList();  //&& s.DeviceType == DeviceTypeEnum.Show


                        var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId && s.DeviceType == DeviceTypeEnum.Show).ToList(); 


                        var modPlc = listPlc.FirstOrDefault(s => s.Id == modPlcUtil.PlcId); 


                        var listaddress = new Dictionary<string, PLCDataTypeEnum>();


                        foreach (var modDevice in listDevice)


@@ -436,7 +428,7 @@


                                    {


                                        var bl = false;


                                        int value = Convert.ToInt32(item.Value);


                                        if (value == 0 || value == 720)


                                        if (value == 0)


                                        {


                                            bl = false;


                                        }


@@ -444,11 +436,12 @@


                                        {


                                            bl = true;


                                        }


                                      


                                        var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3, '0'), BoHaveItem = bl };


                                        HubUtil.PublicPosition(modInfo);


                                        UpdatePosition(modInfo);




                                        if (bl != modDevice.BoHaveItem)


                                        {


                                            var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3, '0'), BoHaveItem = bl };


                                            HubUtil.PublicPosition(modInfo);


                                            UpdatePosition(modInfo);


                                        }


                                        // liudl 注释：和电气工程师确认页面展示交互字后启用。


                                        //var value = Convert.ToBoolean(item.Value);


                                        //if (!value == modDevice.BoHaveItem)