2

schangxiang@126.com

2024-12-10 171ee7068e480ffe07638d030223790fb81fae81

2

 CC/iWareCC_ASRS/FormCC.cs

@@ -612,7 +612,7 @@
        {
            while (true)
            {
                Thread.Sleep(1000);//1秒钟读取一次
                Thread.Sleep(2000);//1秒钟读取一次
                try
                {
                    if (stationServiceClient == null)

 CC/iWareCC_ASRS/Handler/DeviceWarningHandler.cs

@@ -1,4 +1,5 @@
using iWareCommon.Common.Globle;
using Admin.NET.Application;
using iWareCommon.Common.Globle;
using iWareCommon.Utils;
using iWareModel;
using iWareSql.WmsDBModel;
@@ -27,7 +28,10 @@
            {
                using (WmsDBModel edm = new WmsDBModel())
                {
                    dbList = edm.wms_config_device_warning.ToList();
                    //注意：只查询  å®‰å…¨æŠ¥è­¦ã€ç¡¬ä»¶æŠ¥è­¦ä¿¡æ¯
                    var query1 = (int)DeviceWarningTypeEnum.安全报警;
                    var query2 = (int)DeviceWarningTypeEnum.硬件报警;
                    dbList = edm.wms_config_device_warning.Where(x => x.DeviceWarningType == query1 || x.DeviceWarningType == query2).ToList();
                }
                foreach (var item in dbList)
                {

 CC/iWareModel/EnumType/WMS/DeviceWarningTypeEnum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@


using System.ComponentModel;

namespace Admin.NET.Application
{

    /// <summary>
    /// è®¾å¤‡æŠ¥è­¦ç±»åž‹æžšä¸¾
    /// </summary>
    [Description("设备报警类型枚举")]
    public enum DeviceWarningTypeEnum
    {
        /// <summary>
        ///  å®‰å…¨æŠ¥è­¦
        /// </summary>
        [Description("安全报警")]
        å®‰å…¨æŠ¥è­¦ = 0,

        /// <summary>
        /// ç¡¬ä»¶æŠ¥è­¦
        /// </summary>
        [Description("硬件报警")]
        ç¡¬ä»¶æŠ¥è­¦ = 2,

        /// <summary>
        /// è¶…时报警
        /// </summary>
        [Description("超时报警")]
        è¶…时报警 = 3,

        /// <summary>
        /// è­¦å‘Šä¿¡æ¯
        /// </summary>
        [Description("警告信息")]
        è­¦å‘Šä¿¡æ¯ = 4,

        /// <summary>
        /// æ“ä½œæç¤º
        /// </summary>
        [Description("操作提示")]
        æ“ä½œæç¤º = 5,
    }
}

 CC/iWareModel/iWareModel.csproj

@@ -113,6 +113,7 @@
    <Compile Include="EnumType\TaskExcuteTypeEnum.cs" />
    <Compile Include="EnumType\ThreadDirectionEnum.cs" />
    <Compile Include="EnumType\WMS\AreaCodeEnum.cs" />
    <Compile Include="EnumType\WMS\DeviceWarningTypeEnum.cs" />
    <Compile Include="EnumType\WMS\PrintClassifyEnum.cs" />
    <Compile Include="EnumType\WMS\PrintTypeEnum.cs" />
    <Compile Include="EnumType\WMS\PushStatusEnum.cs" />

 SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs

@@ -1274,6 +1274,7 @@
                            //Context = item.WarningContent.Trim(),
                        });
                    }
                    Thread.Sleep(100);
                }
            }
            catch (Exception ex)