From 11a332b2466c10379f30c0f3503a33fb946336fb Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 30 八月 2024 13:44:57 +0800
Subject: [PATCH] 报警信息添加工位字段； 报警页面和首页自适应优化； 绑定首页设备控制和设备数据，与后台实时通讯；
---
Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs b/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
index 5b6c957..3dde306 100644
--- a/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
@@ -5,19 +5,35 @@
/// 鎶ヨ淇℃伅琛�
/// </summary>
[SugarTable("WCSAlarmInfo","鎶ヨ淇℃伅琛�")]
-public class WcsAlarmInfo : EntityBaseData
+public class WcsAlarmInfo : EntityBaseData
{
/// <summary>
/// PLCIP鍦板潃
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "PlcIP", ColumnDescription = "PLCIP鍦板潃", Length = 20)]
- public string? PlcIP { get; set; }
+ public string PlcIP { get; set; }
+ /// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PlcPort", ColumnDescription = "PLCIP鍦板潃")]
+ public int PlcPort { get; set; }
+
+ /// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "StationNum", ColumnDescription = "宸ヤ綅鍙�", Length = 4)]
+ public string StationNum { get; set; }
+
/// <summary>
/// 鎶ヨ缂栧彿
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "AlarmCode", ColumnDescription = "鎶ヨ缂栧彿", Length = 20)]
- public string? AlarmCode { get; set; }
+ public string AlarmCode { get; set; }
/// <summary>
/// 鎶ヨ鎻忚堪
@@ -30,18 +46,18 @@
/// </summary>
[SugarColumn(ColumnName = "LedIP", ColumnDescription = "鏄剧ず灞廼p鍦板潃", Length = 20)]
public string? LedIP { get; set; }
-
+
/// <summary>
/// 鐘舵��
/// </summary>
[SugarColumn(ColumnName = "Status", ColumnDescription = "鐘舵��")]
- public YesNoEnum? Status { get; set; } = YesNoEnum.N;
+ public YesNoEnum? Status { get; set; }
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "Type", ColumnDescription = "璁惧绫诲瀷", Length = 20)]
- public string? Type { get; set; }
+ public PLCTypeEnum Type { get; set; }
/// <summary>
/// 鎶ヨ鏃ユ湡
--
Gitblit v1.8.0