From 66da0f6808fa8496a3216c94973a552389ab96ba Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:27:25 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Entity/WcsPlc.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsPlc.cs b/Admin.NET/WCS.Application/Entity/WcsPlc.cs
index e3a1519..c50e7dd 100644
--- a/Admin.NET/WCS.Application/Entity/WcsPlc.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsPlc.cs
@@ -1,11 +1,13 @@
锘�
+using Org.BouncyCastle.Crypto;
+
namespace WCS.Application;
/// <summary>
/// PLC琛�
/// </summary>
-[SugarTable("WCSPLC","PLC琛�")]
-public class WcsPlc : EntityBaseData
+[SugarTable("WCSPLC", "PLC琛�")]
+public class WcsPlc : EntityBaseData
{
/// <summary>
/// PLCIP鍦板潃
@@ -15,22 +17,40 @@
public string IP { get; set; }
/// <summary>
+ /// PLC绔彛鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "Port", ColumnDescription = "PLC绔彛鍙�")]
+ public int Port { get; set; }
+
+ /// <summary>
+ /// PLC绫诲瀷
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PLCType", ColumnDescription = "PLC绫诲瀷")]
+ public PLCEnum PLCType { get; set; }
+
+ /// <summary>
/// 璁惧绫诲瀷
/// </summary>
[Required]
[SugarColumn(ColumnName = "Type", ColumnDescription = "璁惧绫诲瀷")]
public PLCTypeEnum Type { get; set; }
-
+
/// <summary>
/// 浠撳簱鍙�
/// </summary>
[SugarColumn(ColumnName = "WareHouseNo", ColumnDescription = "浠撳簱鍙�", Length = 20)]
public string? WareHouseNo { get; set; }
-
+
/// <summary>
/// 鎻忚堪
/// </summary>
[SugarColumn(ColumnName = "Text", ColumnDescription = "鎻忚堪", Length = 100)]
public string? Text { get; set; }
-
+
+ /// <summary>
+ /// 鏄惁杩炴帴
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public bool IsConn { get; set; } = false;
}
--
Gitblit v1.8.0