From dd973f741617e3bbf5ecf11747ff71960991549c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 15 十月 2024 10:21:19 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Admin.NET/WCS.Application/Entity/WcsCheckTask.cs | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
index 4e618f3..96428a6 100644
--- a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
@@ -30,7 +30,7 @@
/// 鏈哄櫒浜虹被鍨�
/// </summary>
[SugarColumn(ColumnName = "RoboatType", ColumnDescription = "鏈哄櫒浜虹被鍨�", Length = 5)]
- public string? RoboatType { get; set; }
+ public PLCTypeEnum? RoboatType { get; set; }
/// <summary>
/// 鏈哄櫒浜虹紪鍙�
@@ -79,7 +79,42 @@
/// </summary>
[SugarColumn(ColumnName = "Status", ColumnDescription = "宸ヤ綅缁戝畾鐘舵��", Length = 2)]
public string? Status { get; set; }
-
+
+ /// <summary>
+ /// DB鍖哄煙
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "DbNumber", ColumnDescription = "DB鍖哄煙", Length = 10)]
+ public string DbNumber { get; set; }
+
+ /// <summary>
+ /// 鎶撶鍝佺鍋忕Щ閲�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PlcPos", ColumnDescription = "鎶撶鍝佺鍋忕Щ閲�", Length = 10)]
+ public string PlcPos { get; set; }
+
+ /// <summary>
+ /// 娴佺▼瀛楃被鍨�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PosType", ColumnDescription = "娴佺▼瀛楃被鍨�")]
+ public PLCDataTypeEnum PosType { get; set; }
+
+ /// <summary>
+ /// 鎵规鍋忕Щ閲�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PosLot", ColumnDescription = "鎵规鍋忕Щ閲�", Length = 10)]
+ public string PosLot { get; set; }
+
+ /// <summary>
+ /// 鎵规娴佺▼瀛楃被鍨�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PosTypeLot", ColumnDescription = "鎵规娴佺▼瀛楃被鍨�")]
+ public PLCDataTypeEnum PosTypeLot { get; set; }
+
/// <summary>
/// 鍝佺鍙�
/// </summary>
--
Gitblit v1.8.0