From c06382f1b619e1dc7f37be36a0cee126239abdee Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 30 十月 2024 11:35:22 +0800
Subject: [PATCH] Merge branch 'master' into csc

---
 Admin.NET/WCS.Application/Entity/WcsDevice.cs |   64 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/Admin.NET/WCS.Application/Entity/WcsDevice.cs b/Admin.NET/WCS.Application/Entity/WcsDevice.cs
index 5d2b84c..37eb5ce 100644
--- a/Admin.NET/WCS.Application/Entity/WcsDevice.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsDevice.cs
@@ -4,8 +4,8 @@
 /// <summary>
 /// 璁惧淇℃伅琛�
 /// </summary>
-[SugarTable("WCSPLCDevice","璁惧淇℃伅琛�")]
-public class WcsDevice  : EntityBaseData
+[SugarTable("WCSPLCDevice", "璁惧淇℃伅琛�")]
+public class WcsDevice : EntityBaseData
 {
     /// <summary>
     /// PlcId
@@ -13,53 +13,81 @@
     [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>
-    [SugarColumn(ColumnName = "PosType", ColumnDescription = "娴佺▼瀛楃被鍨�", Length = 10)]
-    public string? PosType { get; set; }
-    
+    [Required]
+    [SugarColumn(ColumnName = "PosType", ColumnDescription = "娴佺▼瀛楃被鍨�")]
+    public PLCDataTypeEnum PosType { get; set; }
+
     /// <summary>
     /// 鏄剧ず灞廼p鍦板潃
     /// </summary>
     [SugarColumn(ColumnName = "LedIP", ColumnDescription = "鏄剧ず灞廼p鍦板潃", Length = 50)]
     public string? LedIP { get; set; }
-    
+
     /// <summary>
     /// 鎻忚堪
     /// </summary>
     [SugarColumn(ColumnName = "Text", ColumnDescription = "鎻忚堪", Length = 20)]
     public string? Text { get; set; }
-    
+
+    /// <summary>
+    /// 浣嶇疆鏈夌墿鍝�
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public bool BoHaveItem { get; set; }
+    /// <summary>
+    /// 楂樺害
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public int BoxHeight { get; set; }
+    /// <summary>
+    /// 鐩殑宸ヤ綅
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string EndLocat { get; set; }
 }

--
Gitblit v1.8.0