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


@@ -15,6 +15,12 @@


    public static bool boRefresh = false;


    //演示模式


    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>();




@@ -52,6 +58,9 @@


        boOffline = _sysConfigService.GetConfigValue<bool>("sys_Offline").Result;


        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连接


@@ -150,7 +159,7 @@


                            {


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


                                //无流程跳出


                                if (value == 0)


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


                                    continue;


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


                                dto.Value = value;


@@ -171,7 +180,7 @@


                            }


                        }




                        Thread.Sleep(10000);


                        Thread.Sleep(1000);


                    }


                    catch (OperationCanceledException)


                    {


@@ -370,8 +379,10 @@


                    {


                        if (modPlcUtil == null)


                            continue;


                        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>();


                        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 listaddress = new Dictionary<string, PLCDataTypeEnum>();


                        foreach (var modDevice in listDevice)


                        {


                            listaddress.Add(modDevice.DbNumber + "." + modDevice.PlcPos, modDevice.PosType);


@@ -397,14 +408,24 @@


                                    {


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


                                        var height = Math.Round(value / 790000d * 200).ToInt();


                                        if (modDevice.BoxHeight != height)


                                        var modPosition = listPlcPosition.FirstOrDefault(s => s.DeviceId == modDevice.Id && s.Text == "目的工位");


                                        string EndLocat = "";


                                        if (modPosition != null)


                                        {


                                            var (result2, value2) = modPlcUtil.GetPlcDBValue(modPosition.PosType, modDevice.DbNumber, modPosition.PlcPos);


                                            if (result2.IsSucceed)


                                                EndLocat = Convert.ToString(value2);


                                        }


                                        if (modDevice.BoxHeight != height || modDevice.EndLocat != EndLocat)


                                        {


                                            modDevice.EndLocat = EndLocat;


                                            modDevice.BoxHeight = Math.Round(value / 790000d * 200).ToInt();


                                            var modInfo = new PlcPositionInfo()


                                            {


                                                Type = modPlc.Type,


                                                StationNum = modDevice.StationNum,


                                                BoxHeight = modDevice.BoxHeight


                                                BoxHeight = modDevice.BoxHeight,


                                                EndLocat = EndLocat,


                                            };


                                            HubUtil.PublicPosition(modInfo);


                                            UpdatePosition(modInfo);


@@ -413,15 +434,31 @@


                                    break;


                                case PLCTypeEnum.ConveyorLine:


                                    {


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


                                        if (value != modDevice.BoHaveItem)


                                        var bl = false;


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


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


                                        {


                                            modDevice.BoHaveItem = value;


                                            //下发状态


                                            var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum, BoHaveItem = value };


                                            HubUtil.PublicPosition(modInfo);


                                            UpdatePosition(modInfo);


                                            bl = false;


                                        }


                                        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);


                                        //}


                                    }


                                    break;


                                default: