.新框架wcs
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liudl
2025-01-20 48d66a079c307356997fb400d27907ff6d363b7b 
 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs


@@ -2,7 +2,9 @@


using DocumentFormat.OpenXml.Drawing;


using Furion.Logging;


using Microsoft.AspNetCore.SignalR;


using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;


using System;


//using WCS.Application.Util;




namespace WCS.Application;


public static class PLCTaskAction


@@ -67,9 +69,10 @@


    /// </summary>


    public static void Init()


    {


        // var strMsg = new HttpService().RequestPackWcs("LN000001");


        cts.Cancel();


        listPlc = _db.Queryable<WcsPlc>()


            .Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine)


            .Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine || s.Type == PLCTypeEnum.StackingRobot)


            .Where(s => s.Enable == YesNoEnum.Y)


            .ToList();


        listPlcDevice = _db.Queryable<WcsDevice>().ToList();


@@ -139,7 +142,7 @@


                        }


                        if (!modPlcUtil.Connected)


                        {


                            Thread.Sleep(10000);


                            Thread.Sleep(1000);


                            modPlcUtil.Open();


                            continue;


                        }


@@ -159,7 +162,7 @@


                            {


                                //Console.WriteLine($"{modPlc.IP}读取{modDevice.DbNumber}.{modDevice.PlcPos}的值为：{value}");


                                //无流程跳出


                                if (value == 0 )// && modPlc.Type!= PLCTypeEnum.BoxConveyorLine


                                if (value == 0)// && modPlc.Type!= PLCTypeEnum.BoxConveyorLine


                                    continue;


                                var dto = modDevice.Adapt<WcsDeviceDto>();


                                dto.Value = value;


@@ -243,7 +246,7 @@


                            HubUtil.PublicPlcConn(modPlc);


                        }


                    }


                    Thread.Sleep(1000);


                    Thread.Sleep(10000);


                }


            }


            catch (OperationCanceledException)


@@ -293,26 +296,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)


                            {


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


@@ -321,7 +316,7 @@


                                listPulish.Add(modAlarm);


                            }


                            //取消报警


                            else if (value && modAlarm.Status == YesNoEnum.Y)


                            else if (!value && modAlarm.Status == YesNoEnum.Y)


                            {


                                modAlarm.AlarmTime = null;


                                modAlarm.Status = YesNoEnum.N;


@@ -338,7 +333,8 @@


                                modLog.Id = 0;


                                listLog.Add(modLog);


                            }


                            _db.Insertable(listLog).ExecuteCommand();


                            if (listLog.Count >= 0)


                                _db.Insertable(listLog).ExecuteCommand();


                            HubUtil.PublicAlarm(listPulish);


                        }


                    }


@@ -380,8 +376,8 @@


                        if (modPlcUtil == null)


                            continue;


                        var plcIp = modPlcUtil.PlcIP;


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


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


                        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,29 +432,22 @@


                                    {


                                        var bl = false;


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


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


                                        if (value <= 30)


                                        {


                                            bl = false;


                                        }


                                        else 


                                        else


                                        {


                                            bl = true;


                                        }


                                      


                                        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)


                                        //{


                                        //    modDevice.BoHaveItem = value;


                                        //    //下发状态


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


                                        //    HubUtil.PublicPosition(modInfo);


                                        //    UpdatePosition(modInfo);


                                        //}


                                        if (bl != modDevice.BoHaveItem)


                                        {


                                            modDevice.BoHaveItem = bl;


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


                                            HubUtil.PublicPosition(modInfo);


                                            UpdatePosition(modInfo);


                                        }


                                    }


                                    break;


                                default:


@@ -466,7 +455,7 @@


                            }


                        }


                    }


                    Thread.Sleep(300);


                    Thread.Sleep(3000);


                }


                catch (Exception ex)


                {