From 4687427f9a801b8999e8fa7eec48b4377bfe4fc1 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 27 八月 2024 17:00:57 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Admin.NET/WCS.Application/Entity/WcsPosition.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsStation.cs b/Admin.NET/WCS.Application/Entity/WcsPosition.cs
similarity index 79%
rename from Admin.NET/WCS.Application/Entity/WcsStation.cs
rename to Admin.NET/WCS.Application/Entity/WcsPosition.cs
index 565ef8b..e481678 100644
--- a/Admin.NET/WCS.Application/Entity/WcsStation.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsPosition.cs
@@ -4,8 +4,8 @@
/// <summary>
/// 宸ヤ綅瀵瑰簲鐨勬祦绋嬪瓧琛�
/// </summary>
-[SugarTable("WCSPLCStation","宸ヤ綅瀵瑰簲鐨勬祦绋嬪瓧琛�")]
-public class WcsStation : EntityBaseData
+[SugarTable("WCSPLCPosition", "宸ヤ綅瀵瑰簲鐨勬祦绋嬪瓧琛�")]
+public class WcsPosition : EntityBaseData
{
/// <summary>
/// 璁惧ID
@@ -13,24 +13,27 @@
[Required]
[SugarColumn(ColumnName = "DeviceId", ColumnDescription = "璁惧ID")]
public long DeviceId { get; set; }
-
+
/// <summary>
/// 宸ヤ綅鍙�
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "StationNum", ColumnDescription = "宸ヤ綅鍙�", Length = 4)]
- public string? StationNum { get; set; }
-
+ public string StationNum { get; set; }
+
/// <summary>
/// 鍋忕Щ閲�
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "PlcPos", ColumnDescription = "鍋忕Щ閲�", Length = 32)]
- public string? PlcPos { get; set; }
-
+ public string PlcPos { 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