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 |   87 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
index fff6418..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>
     /// 鐮佺洏宸ヤ綅鍙�
@@ -39,10 +51,22 @@
     public string? Port { get; set; }
     
     /// <summary>
+    /// 鎵规鍙�
+    /// </summary>
+    [SugarColumn(ColumnName = "LotNo", ColumnDescription = "鎵规鍙�", Length = 50)]
+    public string? LotNo { get; set; }
+    
+    /// <summary>
     /// 鐗╂枡缂栫爜
     /// </summary>
     [SugarColumn(ColumnName = "SkuNo", ColumnDescription = "鐗╂枡缂栫爜", Length = 20)]
     public string? SkuNo { get; set; }
+    
+    /// <summary>
+    /// 鐗╂枡鍚嶇О
+    /// </summary>
+    [SugarColumn(ColumnName = "SkuName", ColumnDescription = "鐗╂枡鍚嶇О", Length = 50)]
+    public string? SkuName { get; set; }
     
     /// <summary>
     /// 瑙勬牸
@@ -55,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>
@@ -71,14 +130,14 @@
     /// <summary>
     /// 鎻掔爜鏁伴噺
     /// </summary>
-    [SugarColumn(ColumnName = "BoxInsert", ColumnDescription = "鎻掔爜鏁伴噺", Length = 20)]
-    public string? BoxInsert { get; set; }
+    [SugarColumn(ColumnName = "BoxInsert", ColumnDescription = "鎻掔爜鏁伴噺")]
+    public int? BoxInsert { get; set; }
     
     /// <summary>
     /// 鎵樼洏涓婄鏁伴噺
     /// </summary>
-    [SugarColumn(ColumnName = "BoxCount", ColumnDescription = "鎵樼洏涓婄鏁伴噺", Length = 20)]
-    public string? BoxCount { get; set; }
+    [SugarColumn(ColumnName = "BoxCount", ColumnDescription = "鎵樼洏涓婄鏁伴噺")]
+    public int? BoxCount { get; set; }
     
     /// <summary>
     /// 鎬荤鏁�/璁″垝绠辨暟/棰勪及绠辨暟
@@ -99,15 +158,9 @@
     public DateTime? BindTime { get; set; }
     
     /// <summary>
-    /// 缁戝畾浜�
+    /// 缁戝畾鑰匢d
     /// </summary>
-    [SugarColumn(ColumnName = "BindUser", ColumnDescription = "缁戝畾浜�")]
-    public int? BindUser { get; set; }
-    
-    /// <summary>
-    /// 鍒涘缓浜�
-    /// </summary>
-    [SugarColumn(ColumnName = "CreateUser", ColumnDescription = "鍒涘缓浜�")]
-    public int? CreateUser { get; set; }
+    [SugarColumn(ColumnName = "BindUserId", ColumnDescription = "缁戝畾鑰匢d")]
+    public long? BindUserId { get; set; }
     
 }

--
Gitblit v1.8.0