FIX

业务工程/时效库/WCS.Entity.Protocol/DSRM/DSRM520.cs

@@ -0,0 +1,191 @@
+using WCS.Entity.Protocol.SRM;
+
+namespace WCS.Entity.Protocol.DSRM
+{
+    /// <summary>
+    /// 堆垛机DB520
+    /// </summary>
+    /// <typeparam name="runSpeed">速度</typeparam>
+    /// <typeparam name="depth">深度</typeparam>
+    /// <typeparam name="taskType">任务类型</typeparam>
+    public interface DSRM520<runSpeed, depth, taskType> : IProtocol
+    {
+        #region 工位一
+
+        /// <summary>
+        /// 任务 ID
+        /// </summary>
+        int TaskID_1 { get; set; }
+
+        /// <summary>
+        /// 任务起始行
+        /// </summary>
+        short RowPos1_1 { get; set; }
+
+        /// <summary>
+        /// 任务行走起始列
+        /// </summary>
+        short TravelPos1_1 { get; set; }
+
+        /// <summary>
+        /// 任务提升起始层
+        /// </summary>
+        short LiftPos1_1 { get; set; }
+
+        /// <summary>
+        /// 任务起始伸叉深度
+        /// </summary>
+        SRMForkPos ForkStartPos1_1 { get; set; }
+
+        /// <summary>
+        /// 任务目标行
+        /// </summary>
+        short RowPos2_1 { get; set; }
+
+        /// <summary>
+        /// 任务行走目标列
+        /// </summary>
+        short TravelPos2_1 { get; set; }
+
+        /// <summary>
+        /// 任务提升目标层
+        /// </summary>
+        short LiftPos2_1 { get; set; }
+
+        /// <summary>
+        /// 任务目标伸叉深度
+        /// </summary>
+        SRMForkPos ForkDestPos2_1 { get; set; }
+
+        /// <summary>
+        /// 货物类型 根据实际情况决定具体值含义
+        /// </summary>
+        short GoodsType_1 { get; set; }
+
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        SRMTaskType TaskType_1 { get; set; }
+
+        /// <summary>
+        /// 任务完成确认清除信号
+        /// </summary>
+        short OK_ACK_1 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        int RES_1_1 { get; set; }
+
+        /// <summary>
+        ///备用
+        /// </summary>
+        short RES_1_2 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_1_3 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_1_4 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        SRMStatus RES_1_5 { get; set; }
+
+        #endregion 工位一
+
+        #region 二工位
+
+        /// <summary>
+        /// 任务 ID
+        /// </summary>
+        int TaskID_2 { get; set; }
+
+        /// <summary>
+        /// 任务起始行
+        /// </summary>
+        short RowPos1_2 { get; set; }
+
+        /// <summary>
+        /// 任务行走起始列
+        /// </summary>
+        short Travelpos1_2 { get; set; }
+
+        /// <summary>
+        /// 任务提升起始层
+        /// </summary>
+        short Liftpos1_2 { get; set; }
+
+        /// <summary>
+        /// 任务起始伸叉深度
+        /// </summary>
+        SRMForkPos ForkStartPos1_2 { get; set; }
+
+        /// <summary>
+        /// 任务目标行
+        /// </summary>
+        short RowPos2_2 { get; set; }
+
+        /// <summary>
+        /// 任务行走目标列
+        /// </summary>
+        short Travelpos2_2 { get; set; }
+
+        /// <summary>
+        /// 任务提升目标层
+        /// </summary>
+        short Liftpos2_2 { get; set; }
+
+        /// <summary>
+        /// 任务目标伸叉深度
+        /// </summary>
+        SRMForkPos ForkStartPos2_2 { get; set; }
+
+        /// <summary>
+        /// 货物类型 根据实际情况决定具体值含义
+        /// </summary>
+        short Goodstype_2 { get; set; }
+
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        SRMTaskType TaskType_2 { get; set; }
+
+        /// <summary>
+        /// 任务完成确认清除信号
+        /// </summary>
+        short OK_ACK_2 { get; set; }
+
+        /// <summary>
+        /// 任务数量
+        /// </summary>
+        short TaskSum_2 { get; set; }
+
+        /// <summary>
+        /// 凭证号
+        /// </summary>
+        int VoucherNo_2 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_2_1 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_2_2 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        SRMStatus RES_2_3 { get; set; }
+
+        #endregion 二工位
+    }
+}

业务工程/时效库/WCS.Entity.Protocol/DSRM/DSRM521.cs

@@ -0,0 +1,633 @@
+using System;
+
+namespace WCS.Entity.Protocol.DSRM
+{
+    /// <summary>
+    /// 堆垛机DB521
+    /// </summary>
+    /// <typeparam name="status">状态</typeparam>
+    /// <typeparam name="autoStatus">运行模式</typeparam>
+    /// <typeparam name="runStatus">运行状态</typeparam>
+    /// <typeparam name="runSpeed">运行速度</typeparam>
+    /// <typeparam name="depth">深度</typeparam>
+    /// <typeparam name="taskType">任务类型</typeparam>
+    public interface DSRM521<status, autoStatus, runStatus, runSpeed, depth, taskType> : IProtocol
+    {
+        #region 一工位
+
+        /// <summary>
+        /// 任务 ID
+        /// </summary>
+        int TaskID_1 { get; set; }
+
+        /// <summary>
+        /// 任务起始行
+        /// </summary>
+        short RowPos1_1 { get; set; }
+
+        /// <summary>
+        /// 任务行走起始列
+        /// </summary>
+        short TravelPos1_1 { get; set; }
+
+        /// <summary>
+        /// 任务提升起始层
+        /// </summary>
+        short LiftPos1_1 { get; set; }
+
+        /// <summary>
+        /// 任务起始伸叉深度
+        /// </summary>
+        SRMForkPos ForkStartPos1_1 { get; set; }
+
+        /// <summary>
+        /// 任务目标行
+        /// </summary>
+        short RowPos2_1 { get; set; }
+
+        /// <summary>
+        /// 任务行走目标列
+        /// </summary>
+        short TravelPos2_1 { get; set; }
+
+        /// <summary>
+        /// 任务提升目标层
+        /// </summary>
+        short LiftPos2_1 { get; set; }
+
+        /// <summary>
+        /// 任务目标伸叉深度
+        /// </summary>
+        SRMForkPos ForkDestPos2_1 { get; set; }
+
+        /// <summary>
+        /// 完成任务ID
+        /// </summary>
+        int TaskFinishiID_1 { get; set; }
+
+        /// <summary>
+        /// 货叉模式
+        /// </summary>
+        SRMAutoStatus AutoStatus_1 { get; set; }
+
+        /// <summary>
+        /// 货叉运行状态
+        /// </summary>
+        SRMForkRunStatus RunStatus_1 { get; set; }
+
+        /// <summary>
+        /// 当前行
+        /// </summary>
+        short Srm_Row_1 { get; set; }
+
+        /// <summary>
+        /// 当前列
+        /// </summary>
+        short Srm_Column_1 { get; set; }
+
+        /// <summary>
+        /// 当前层
+        /// </summary>
+        short Srm_Layer_1 { get; set; }
+
+        /// <summary>
+        /// 行走当前位置 MM
+        /// </summary>
+        [IgnoreChanging]
+        int TravelPos_1 { get; set; }
+
+        /// <summary>
+        /// 提升当前位置 MM
+        /// </summary>
+        [IgnoreChanging]
+        int LiftPos_1 { get; set; }
+
+        /// <summary>
+        /// 货叉当前位置 MM 往左为负值，往右为正
+        /// </summary>
+        [IgnoreChanging]
+        int ForkPos_1 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        [IgnoreChanging]
+        float RES_1_1 { get; set; }
+
+        /// <summary>
+        /// 货物类型
+        /// </summary>
+        short Goodstype_1 { get; set; }
+
+        /// <summary>
+        /// 运行时间(Real)(单位：小时,带小数)
+        /// </summary>
+        [IgnoreChanging]
+        float Runtime_1 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        int RES_1_2 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_1_3 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_1_5 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_1_6 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_1_7 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_1_8 { get; set; }
+
+        /// <summary>
+        /// 货叉状态
+        /// </summary>
+        SRMForkStatus RES_1_9 { get; set; }
+
+        #endregion 一工位
+
+        #region 二工位
+
+        /// <summary>
+        /// 任务 ID
+        /// </summary>
+        int TaskID_2 { get; set; }
+
+        /// <summary>
+        /// 任务起始行
+        /// </summary>
+        short RowPos1_2 { get; set; }
+
+        /// <summary>
+        /// 任务行走起始列
+        /// </summary>
+        short TravelPos1_2 { get; set; }
+
+        /// <summary>
+        /// 任务提升起始层
+        /// </summary>
+        short LiftPos1_2 { get; set; }
+
+        /// <summary>
+        /// 任务起始伸叉深度
+        /// </summary>
+        SRMForkPos ForkStartPos1_2 { get; set; }
+
+        /// <summary>
+        /// 任务目标行
+        /// </summary>
+        short RowPos2_2 { get; set; }
+
+        /// <summary>
+        /// 任务行走目标列
+        /// </summary>
+        short TravelPos2_2 { get; set; }
+
+        /// <summary>
+        /// 任务提升目标层
+        /// </summary>
+        short LiftPos2_2 { get; set; }
+
+        /// <summary>
+        /// 任务目标伸叉深度
+        /// </summary>
+        SRMForkPos ForkDestPos2_2 { get; set; }
+
+        /// <summary>
+        /// 完成任务ID
+        /// </summary>
+        int TaskFinishiID_2 { get; set; }
+
+        /// <summary>
+        /// 货叉模式
+        /// </summary>
+        SRMAutoStatus AutoStatus_2 { get; set; }
+
+        /// <summary>
+        /// 货叉运行状态
+        /// </summary>
+        SRMForkRunStatus RunStatus_2 { get; set; }
+
+        /// <summary>
+        /// 当前行
+        /// </summary>
+        short Srm_Row_2 { get; set; }
+
+        /// <summary>
+        /// 当前列
+        /// </summary>
+        short Srm_Column_2 { get; set; }
+
+        /// <summary>
+        /// 当前层
+        /// </summary>
+        short Srm_Layer_2 { get; set; }
+
+        /// <summary>
+        /// 行走当前位置 MM
+        /// </summary>
+        [IgnoreChanging]
+        int TravelPos_2 { get; set; }
+
+        /// <summary>
+        /// 提升当前位置 MM
+        /// </summary>
+        [IgnoreChanging]
+        int LiftPos_2 { get; set; }
+
+        /// <summary>
+        /// 货叉当前位置 MM 往左为负值，往右为正
+        /// </summary>
+        [IgnoreChanging]
+        int ForkPos_2 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        [IgnoreChanging]
+        float RES_2_1 { get; set; }
+
+        /// <summary>
+        /// 货物类型
+        /// </summary>
+        short Goodstype_2 { get; set; }
+
+        /// <summary>
+        /// 运行时间(Real)(单位：小时,带小数)
+        /// </summary>
+        [IgnoreChanging]
+        float Runtime_2 { get; set; }
+
+        /// <summary>
+        /// 凭证号
+        /// </summary>
+        int VoucherNo_2 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        int RES_2_2 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_2_3 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_2_4 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES_2_5 { get; set; }
+
+        /// <summary>
+        /// 货叉状态
+        /// </summary>
+        SRMForkStatus RES_2_6 { get; set; }
+
+        #endregion 二工位
+
+        #region 公用
+
+        /// <summary>
+        /// 堆垛机模式
+        /// </summary>
+        SRMAutoStatus SRMStatus { get; set; }
+
+        /// <summary>
+        /// 堆垛机状态
+        /// </summary>
+        SRMFRunStatus SrmRunStatus { get; set; }
+
+        /// <summary>
+        /// 堆垛机运行里程数(单位：千米)
+        /// </summary>
+        [IgnoreChanging]
+        float TotalKM { get; set; }
+
+        /// <summary>
+        /// 运行时间(Real)(单位：小时,带小数)
+        /// </summary>
+        [IgnoreChanging]
+        float Runtime { get; set; }
+
+        /// <summary>
+        /// 堆垛机是否异常 1:异常 0：正常
+        /// </summary>
+        short Alarm { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        int RES1 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES2 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES3 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        int RES4 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES5 { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        short RES6 { get; set; }
+
+        #endregion 公用
+    }
+
+    /// <summary>
+    /// 货叉深度
+    /// </summary>
+    public enum SRMForkPos : short
+    {
+        中位 = 0,
+        深度1 = 1,
+        深度2 = 2
+    }
+
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    public enum SRMTaskType : short
+    {
+        完成任务 = 1,
+        删除任务 = 2,
+        移动任务 = 3,
+        取放货任务 = 4
+    }
+
+    /// <summary>
+    /// SRM状态
+    /// </summary>
+    [Flags]
+    public enum SRMStatus : ushort
+    {
+        RES_1_5 = 1 << 0,
+        RES_1_6 = 1 << 1,
+        RES_1_7 = 1 << 2,
+        RES_1_8 = 1 << 3,
+        RES_1_9 = 1 << 4,
+        RES_1_10 = 1 << 5,
+        RES_1_11 = 1 << 6,
+        RES_1_12 = 1 << 7,
+        RES_1_13 = 1 << 8,
+        RES_1_14 = 1 << 9,
+        RES_1_15 = 1 << 10,
+        RES_1_16 = 1 << 11,
+        RES_1_17 = 1 << 12,
+        RES_1_18 = 1 << 13,
+        RES_1_19 = 1 << 14,
+        RES_1_20 = 1 << 15,
+    }
+
+    /// <summary>
+    /// 速度模式
+    /// </summary>
+    public enum SCSpeedMode : short
+    {
+        正常 = 0,
+        低速 = 1
+    }
+
+    /// <summary>
+    /// 货叉运行状态
+    /// </summary>
+    public enum SRMForkRunStatus : short
+    {
+        空闲 = 1,
+        取货伸叉 = 2,
+        取货抬叉 = 3,
+        取货收叉 = 4,
+        放货伸叉 = 5,
+        取货降叉 = 6,
+        放货收叉 = 7,
+        维护 = 99
+    }
+
+    /// <summary>
+    /// 堆垛机运行状态
+    /// </summary>
+    public enum SRMFRunStatus : short
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        空闲 = 1,
+
+        /// <summary>
+        ///
+        /// </summary>
+        取货行走 = 2,
+
+        /// <summary>
+        ///
+        /// </summary>
+        取货伸叉 = 3,
+
+        /// <summary>
+        ///
+        /// </summary>
+        取货抬叉 = 4,
+
+        /// <summary>
+        ///
+        /// </summary>
+        取货收叉 = 5,
+
+        /// <summary>
+        ///
+        /// </summary>
+        放货行走 = 6,
+
+        /// <summary>
+        ///
+        /// </summary>
+        放货伸叉 = 7,
+
+        /// <summary>
+        ///
+        /// </summary>
+        取货降叉 = 8,
+
+        /// <summary>
+        ///
+        /// </summary>
+        放货收叉 = 9,
+
+        /// <summary>
+        ///
+        /// </summary>
+        维护 = 99
+    }
+
+    /// <summary>
+    /// 运行模式
+    /// </summary>
+    public enum SRMAutoStatus : short
+    {
+        远程 = 1,
+        半自动 = 2,
+        手动 = 3,
+        维修 = 4
+    }
+
+    /// <summary>
+    /// 货叉状态
+    /// </summary>
+    [Flags]
+    public enum SRMForkStatus : ushort
+    {
+        /// <summary>
+        /// 完成取货信号
+        /// </summary>
+        Get_Finishi = 1 << 0,
+
+        /// <summary>
+        /// 完成放货信号
+        /// </summary>
+        Put_Finishi = 1 << 1,
+
+        /// <summary>
+        /// 设备故障状态
+        /// </summary>
+        Alarm = 1 << 2,
+
+        /// <summary>
+        /// 当前任务完成
+        /// </summary>
+        Task_Finishi = 1 << 3,
+
+        /// <summary>
+        /// 设备上有货
+        /// </summary>
+        Loaded = 1 << 4,
+
+        /// <summary>
+        /// 货叉在原位
+        /// </summary>
+        Fork_Center = 1 << 5,
+
+        /// <summary>
+        /// 反馈WCS能否发任务
+        /// </summary>
+        IssueTask = 1 << 6,
+
+        RES_1_9 = 1 << 7,
+        RES_1_10 = 1 << 8,
+        RES_1_11 = 1 << 9,
+        RES_1_12 = 1 << 10,
+        RES_1_13 = 1 << 11,
+        RES_1_14 = 1 << 12,
+        RES_1_15 = 1 << 13,
+        RES_1_16 = 1 << 14,
+        RES_1_17 = 1 << 15,
+    }
+
+    /// <summary>
+    /// 堆垛机报警
+    /// </summary>
+    [Flags]
+    public enum SCAlarm : ulong
+    {
+        无 = 0,
+        主柜急停 = 1L << 0,
+        分柜急停 = 1L << 1,
+        取货点异常 = 1L << 2,
+        放货点有货 = 1L << 3,
+        货叉取货完成后无货 = 1L << 4,
+        货叉无任务有货异常 = 1L << 5,
+        货叉运行超时 = 1L << 6,
+        货叉左侧超行程 = 1L << 7,
+        货物左前坍塌 = 1L << 8,
+        货物右前坍塌 = 1L << 9,
+        前限位触发 = 1L << 10,
+        后限位触发 = 1L << 11,
+        上限位触发 = 1L << 12,
+        下限位触发 = 1L << 13,
+        超载限位触发 = 1L << 14,
+        松绳限位触发1 = 1L << 15,
+        行走运动超行程 = 1L << 16,
+        起升运动超行程 = 1L << 17,
+        行走变频器报警 = 1L << 18,
+        提升变频器报警 = 1L << 19,
+        货叉变频器报警 = 1L << 20,
+        提升超速报警 = 1L << 21,
+        风扇, 灯, 插座空开 = 1L << 22,
+        触摸屏, 光通讯, 激光测距空开 = 1L << 23,
+        行走马达保护器 = 1L << 24,
+        行走抱闸空开 = 1L << 25,
+        起升马达保护器 = 1L << 26,
+        起升抱闸空开 = 1L << 27,
+        货叉马达保护器 = 1L << 28,
+        货叉抱闸空开 = 1L << 29,
+        安全门打开 = 1L << 30,
+        安全继电器报警 = 1L << 31,
+        当前货位已禁用 = 1L << 32,
+        组态中断报警 = 1L << 33,
+        货物左前超出 = 1L << 34,
+        货物左后超出 = 1L << 35,
+        货物右前超出 = 1L << 36,
+        货物右后超出 = 1L << 37,
+        相序保护 = 1L << 38,
+        货物右超高1M5 = 1L << 39,
+        安全门1报警 = 1L << 40,
+        安全门2报警 = 1L << 41,
+        行走测距信号丢失报警 = 1L << 42,
+        提升测距信号丢失报警 = 1L << 43,
+        行走定位失败 = 1L << 44,
+        提升定位失败 = 1L << 45,
+        回中定位失败 = 1L << 46,
+
+        //根据堆垛机通讯协议定义 下述报警暂时不存在
+        堆垛机巷道有人进入, 光通讯中断 = 1L << 47,
+
+        货叉位置错误 = 1L << 48,
+        货叉编码器报警 = 1L << 49,
+        货叉编码器报警中间位 = 1L << 50,
+        货叉中位光电异常 = 1L << 51,
+        载货台电源空开 = 1L << 52,
+        按钮, 安全回路空开 = 1L << 53,
+        货物左后坍塌 = 1L << 54,
+        货物右后坍塌 = 1L << 55,
+        登梯口急停 = 1L << 56,
+        货物左超高1M9 = 1L << 57,
+        货物右超高1M9 = 1L << 58,
+        松绳限位触发2 = 1L << 59,
+        货叉右侧超行程 = 1L << 60,
+        取放货托盘总数超限 = 1L << 61,
+        安全门急停 = 1L << 62,
+    }
+}

业务工程/时效库/WCS.Entity.Protocol/DSRM/DSRM537.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel;
+
+namespace WCS.Entity.Protocol.DSRM
+{
+    /// <summary>
+    /// 堆垛机DB523
+    /// </summary>
+    /// <typeparam name="alarm">报警</typeparam>
+    public interface DSRM537<alarm> : IProtocol
+    {
+        /// <summary>
+        ///  报警内容
+        /// </summary>
+        [Description("报警内容")]
+        alarm Alarm { get; set; }
+    }
+}

业务工程/时效库/WCS.Entity.Protocol/DSRM/DSrmEnum.cs

@@ -1,6 +1,7 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 
-namespace WCS.WorkEngineering.Protocol.SRM
+namespace WCS.Entity.Protocol.DSRM
 {
     /// <summary>
     /// 运行模式

业务工程/时效库/WCS.Entity.Protocol/DSRM/IDSRM520.cs

@@ -1,13 +1,12 @@
 using System.ComponentModel;
-using WCS.Entity.Protocol.SRM;
 
-namespace WCS.WorkEngineering.Protocol.SRM
+namespace WCS.Entity.Protocol.DSRM
 {
     /// <summary>
     ///  堆垛机DB520
     /// </summary>
     [Description("堆垛机DB520")]
-    public interface IDSRM520 : SRM520<SrmRunSpeed, SrmForkPosition, SrmTaskType>
+    public interface IDSRM520 : DSRM520<SrmRunSpeed, SrmForkPosition, SrmTaskType>
     {
     }
 }

业务工程/时效库/WCS.Entity.Protocol/DSRM/IDSRM521.cs

@@ -1,13 +1,12 @@
 using System.ComponentModel;
-using WCS.Entity.Protocol.SRM;
 
-namespace WCS.WorkEngineering.Protocol.SRM
+namespace WCS.Entity.Protocol.DSRM
 {
     /// <summary>
     ///  堆垛机DB521
     /// </summary>
     [Description("堆垛机DB521")]
-    public interface IDSRM521 : SRM521<SrmStatus, SrmAutoStatus, SrmRunStatus, SrmRunSpeed, SrmForkPosition, SrmTaskType>
+    public interface IDSRM521 : DSRM521<SrmStatus, SrmAutoStatus, SrmRunStatus, SrmRunSpeed, SrmForkPosition, SrmTaskType>
     {
     }
 }

业务工程/时效库/WCS.Entity.Protocol/DSRM/IDSRM537.cs

@@ -1,13 +1,12 @@
 using System.ComponentModel;
-using WCS.Entity.Protocol.SRM;
 
-namespace WCS.WorkEngineering.Protocol.SRM
+namespace WCS.Entity.Protocol.DSRM
 {
     /// <summary>
     ///  堆垛机DB523
     /// </summary>
     [Description("堆垛机DB523")]
-    public interface IDSRM537 : SRM537<SrmAlarm>
+    public interface IDSRM537 : DSRM537<SrmAlarm>
     {
     }
 }

业务工程/时效库/WCS.Entity.Protocol/DSRM/WCS_DSRM537.cs

@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using WCS.Entity.Protocol.DSRM;
 
 namespace WCS.WorkEngineering.Protocol.SRM
 {