Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6

IPC-610

2024-10-15 79ad6097cbe4b4d6cee66dd8ad9c3c1c8f2b5243

 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs

@@ -17,6 +17,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 +59,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 +159,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;
@@ -374,7 +380,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 +436,7 @@
                                    {
                                        var bl = false;
                                        int value = Convert.ToInt32(item.Value);
                                        if (value == 0 || value == 720)
                                        if (value == 0)
                                        {
                                            bl = false;
                                        }
@@ -438,11 +444,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)