Merge branch 'master' into wxw

wxw

2024-09-25 54728bfad5a2b222ff26e4f6be26bd239b3c5720

 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连接
@@ -150,7 +153,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;