From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
index 839d637..8e18944 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
@@ -27,7 +27,7 @@
namespace WIDESEAWCS_Model.Models
{
- [SugarTable(nameof(Dt_Task), "浠诲姟淇℃伅")]
+ [SugarTable(nameof(Dt_Task), "浠诲姟淇℃伅"), SugarIndex("unique_task_taskNum", nameof(TaskNum), OrderByType.Asc, true)]
public class Dt_Task : BaseEntity
{
/// <summary>
@@ -45,6 +45,22 @@
[ExporterHeader(DisplayName = "浠诲姟鍙�")]
[SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鍙�")]
public int TaskNum { get; set; }
+
+ /// <summary>
+ /// 浠撳簱涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "浠撳簱涓婚敭")]
+ [ExporterHeader(DisplayName = "浠撳簱涓婚敭")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
+ public int WarehouseId { get; set; }
+
+ /// <summary>
+ /// AGV浠诲姟鍙�
+ /// </summary>
+ [ImporterHeader(Name = "AGV浠诲姟鍙�")]
+ [ExporterHeader(DisplayName = "AGV浠诲姟鍙�")]
+ [SugarColumn(IsNullable = true,Length =50, ColumnDescription = "AGV浠诲姟鍙�")]
+ public string AgvTaskNum { get; set; }
/// <summary>
/// 鎵樼洏缂栧彿
@@ -95,7 +111,7 @@
/// </summary>
[ImporterHeader(Name = "璧峰鍦板潃")]
[ExporterHeader(DisplayName = "璧峰鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璧峰鍦板潃")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "璧峰鍦板潃")]
public string SourceAddress { get; set; }
/// <summary>
@@ -103,7 +119,7 @@
/// </summary>
[ImporterHeader(Name = "鐩爣鍦板潃")]
[ExporterHeader(DisplayName = "鐩爣鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鐩爣鍦板潃")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐩爣鍦板潃")]
public string TargetAddress { get; set; }
/// <summary>
@@ -111,7 +127,7 @@
/// </summary>
[ImporterHeader(Name = "褰撳墠浣嶇疆")]
[ExporterHeader(DisplayName = "褰撳墠浣嶇疆")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "褰撳墠浣嶇疆")]
public string CurrentAddress { get; set; }
/// <summary>
@@ -119,7 +135,7 @@
/// </summary>
[ImporterHeader(Name = "涓嬩竴鍦板潃")]
[ExporterHeader(DisplayName = "涓嬩竴鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "涓嬩竴鍦板潃")]
public string NextAddress { get; set; }
/// <summary>
@@ -145,7 +161,13 @@
[ExporterHeader(DisplayName = "WMS浠诲姟涓婚敭")]
[SugarColumn(IsNullable = false, ColumnDescription = "WMS浠诲姟涓婚敭")]
public int WMSId { get; set; }
-
+ /// <summary>
+ /// 楂樺害绫诲瀷
+ /// </summary>
+ [ImporterHeader(Name = "楂樺害绫诲瀷")]
+ [ExporterHeader(DisplayName = "楂樺害绫诲瀷")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "楂樺害绫诲瀷")]
+ public int HeightType { get; set; }
/// <summary>
/// 浠诲姟涓嬪彂鏃堕棿
/// </summary>
@@ -155,6 +177,20 @@
public DateTime? Dispatchertime { get; set; }
/// <summary>
+ /// 浠诲姟缁�
+ /// </summary>
+ [ImporterHeader(Name = "浠诲姟缁�")]
+ [ExporterHeader(DisplayName = "浠诲姟缁�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟缁�")]
+ public string GroupId { get; set; }
+ /// <summary>
+ /// 浠诲姟鐗╂枡闀垮害
+ /// </summary>
+ [ImporterHeader(Name = "浠诲姟鐗╂枡闀垮害")]
+ [ExporterHeader(DisplayName = "浠诲姟鐗╂枡闀垮害")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鐗╂枡闀垮害")]
+ public int TaskLength { get; set; }
+ /// <summary>
/// 澶囨敞
/// </summary>
[ImporterHeader(Name = "澶囨敞")]
--
Gitblit v1.9.3