修改

DOAN.Model/PBL/AlarmLog.cs

@@ -0,0 +1,60 @@
+
+namespace DOAN.Model.PBL
+{
+    /// <summary>
+    /// 库存报警日志
+    /// </summary>
+    [SugarTable("alarm_log")]
+    public class AlarmLog
+    {
+        /// <summary>
+        /// 主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 名称 
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 编码 
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 料架id 
+        /// </summary>
+        [SugarColumn(ColumnName = "storagelocation_id")]
+        public int? StoragelocationId { get; set; }
+
+        /// <summary>
+        /// 系统类别 
+        /// </summary>
+        public int? Type { get; set; }
+
+        /// <summary>
+        /// 系统状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 系统备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 发生时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "action_time")]
+        public DateTime? ActionTime { get; set; }
+
+        /// <summary>
+        /// 完成报警时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "end_time")]
+        public DateTime? EndTime { get; set; }
+
+    }
+}

DOAN.Model/PBL/Dto/AlarmLogDto.cs

@@ -0,0 +1,48 @@
+
+namespace DOAN.Model.PBL.Dto
+{
+    /// <summary>
+    /// 库存报警日志查询对象
+    /// </summary>
+    public class AlarmLogQueryDto : PagerInfo 
+    {
+        public string Name { get; set; }
+        public string Code { get; set; }
+        public int? StoragelocationId { get; set; }
+        public int? Type { get; set; }
+        public int? Status { get; set; }
+
+        public DateTime? StartTime { get; set; }
+        public DateTime? EndTime { get; set; }
+    }
+
+    /// <summary>
+    /// 库存报警日志输入输出对象
+    /// </summary>
+    public class AlarmLogDto
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public string Id { get; set; }
+
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public int? StoragelocationId { get; set; }
+
+        public int? Type { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public DateTime? ActionTime { get; set; }
+
+        public DateTime? EndTime { get; set; }
+
+
+
+        [ExcelColumn(Name = "系统类别")]
+        public string TypeLabel { get; set; }
+    }
+}

DOAN.Model/PBL/PlcButton.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.PBL
+{
+    /// <summary>
+    /// PLC地址
+    /// </summary>
+    [SugarTable("plc_button_table")]
+    public class PlcButton
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public int Id { get; set; }
+
+        /// <summary>
+        ///  按钮名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 按钮型号
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 料架id
+        /// </summary>
+        [SugarColumn(ColumnName = "storagelocation_id")]
+        public int StoragelocationId { get; set; }
+
+        /// <summary>
+        /// PLC地址
+        /// </summary>
+        public int Address { get; set; }
+
+        /// <summary>
+        /// PLC地址下标
+        /// </summary>
+        public int Index { get; set; }
+
+    }
+}