wxw
2024-09-25 350507ac0a6ccfa0463612996731f4165fe55601
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -15,6 +15,8 @@
    public static bool boRefresh = false;
    //演示模式
    public static bool boDemo = false;
    //滚筒反转
    public static bool boDrumReversal = false;
    public static List<PlcPositionInfo> listPositionInfo = new List<PlcPositionInfo>();
@@ -52,6 +54,7 @@
        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;
    }
    /// <summary>
    /// 初始化PLC连接
@@ -370,8 +373,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);
@@ -423,15 +428,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: