From 54da8a22c438e1495b9c5fbae75ca9d4b5ca7335 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 02 九月 2024 16:04:37 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Entity/WcsDevice.cs | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsDevice.cs b/Admin.NET/WCS.Application/Entity/WcsDevice.cs
index beca712..c1675c9 100644
--- a/Admin.NET/WCS.Application/Entity/WcsDevice.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsDevice.cs
@@ -13,42 +13,55 @@
[Required]
[SugarColumn(ColumnName = "PlcId", ColumnDescription = "PlcId")]
public long PlcId { get; set; }
-
+
+ /// <summary>
+ /// 浜や簰绫诲瀷
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "DeviceType", ColumnDescription = "浜や簰绫诲瀷")]
+ public DeviceTypeEnum DeviceType { get; set; }
+
/// <summary>
/// 璁惧绾у埆
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "Level", ColumnDescription = "璁惧绾у埆")]
- public DeviceLevelEnum? Level { get; set; }
-
+ public DeviceLevelEnum Level { get; set; }
+
/// <summary>
/// DB鍖哄煙
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "DbNumber", ColumnDescription = "DB鍖哄煙", Length = 10)]
- public string? DbNumber { get; set; }
-
+ public string DbNumber { get; set; }
+
/// <summary>
/// 宸ヤ綅鍙�
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "StationNum", ColumnDescription = "宸ヤ綅鍙�", Length = 4)]
- public string? StationNum { get; set; }
-
+ public string StationNum { get; set; }
+
/// <summary>
/// PLC鍋忕Щ閲�
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "PlcPos", ColumnDescription = "PLC鍋忕Щ閲�", Length = 10)]
- public string? PlcPos { get; set; }
-
+ public string PlcPos { get; set; }
+
/// <summary>
/// WCS鍋忕Щ閲�
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "WcsPos", ColumnDescription = "WCS鍋忕Щ閲�", Length = 10)]
- public string? WcsPos { get; set; }
-
+ public string WcsPos { get; set; }
+
/// <summary>
/// 娴佺▼瀛楃被鍨�
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "PosType", ColumnDescription = "娴佺▼瀛楃被鍨�")]
- public PLCDataTypeEnum? PosType { get; set; }
+ public PLCDataTypeEnum PosType { get; set; }
/// <summary>
/// 鏄剧ず灞廼p鍦板潃
--
Gitblit v1.8.0