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/WcsCheckTask.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
index 9b0970e..96428a6 100644
--- a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
@@ -15,11 +15,23 @@
public class WcsCheckTask : EntityBaseData
{
/// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "TaskNo", ColumnDescription = "浠诲姟鍙�", Length = 20)]
+ public string? TaskNo { get; set; }
+
+ /// <summary>
/// WMS涓嬪彂鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "OrderNo", ColumnDescription = "WMS涓嬪彂鍗曞彿", Length = 20)]
public string? OrderNo { get; set; }
-
+
+ /// <summary>
+ /// 鏈哄櫒浜虹被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "RoboatType", ColumnDescription = "鏈哄櫒浜虹被鍨�", Length = 5)]
+ public PLCTypeEnum? RoboatType { get; set; }
+
/// <summary>
/// 鏈哄櫒浜虹紪鍙�
/// </summary>
@@ -29,8 +41,8 @@
/// <summary>
/// 鍒嗘嫞绾跨紪鍙�
/// </summary>
- [SugarColumn(ColumnName = "LineNO", ColumnDescription = "鍒嗘嫞绾跨紪鍙�", Length = 5)]
- public string? LineNO { get; set; }
+ [SugarColumn(ColumnName = "LineNo", ColumnDescription = "鍒嗘嫞绾跨紪鍙�", Length = 5)]
+ public string? LineNo { get; set; }
/// <summary>
/// 鐮佺洏宸ヤ綅鍙�
@@ -67,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