.新框架wcs
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
IPC-610
2024-10-21 f040136ab8029cc207a8111d21c78bbf315a6dbd 
 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


@@ -17,6 +19,10 @@


    public static bool boDemo = false;


    //滚筒反转


    public static bool boDrumReversal = false;


    //出库锁定


    public static bool boOutLock = false;


    //入库锁定


    public static bool boEnterLock = false;




    public static List<PlcPositionInfo> listPositionInfo = new List<PlcPositionInfo>();




@@ -55,6 +61,8 @@


        boRefresh = _sysConfigService.GetConfigValue<bool>("sys_Refresh").Result;


        boDemo = _sysConfigService.GetConfigValue<bool>("sys_demo").Result;


        boDrumReversal = _sysConfigService.GetConfigValue<bool>("sys_DrumReversal").Result;


        boOutLock = _sysConfigService.GetConfigValue<bool>("sys_BoOutLock").Result;


        boEnterLock = _sysConfigService.GetConfigValue<bool>("sys_BoEnterLock").Result;


    }


    /// <summary>


    /// 初始化PLC连接


@@ -153,7 +161,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;


@@ -287,26 +295,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)


                            {


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


@@ -374,7 +374,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)


@@ -430,7 +430,7 @@


                                    {


                                        var bl = false;


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


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


                                        if (value <= 30)


                                        {


                                            bl = false;


                                        }


@@ -438,21 +438,14 @@


                                        {


                                            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:


@@ -460,7 +453,7 @@


                            }


                        }


                    }


                    Thread.Sleep(300);


                    Thread.Sleep(3000);


                }


                catch (Exception ex)


                {