From a8756c3526832332db4ef5685348d9b188c2bf2b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 13 九月 2025 08:36:44 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
index ab7a584..1e683f8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
@@ -44,6 +44,7 @@
/// <summary>
/// 鎵樼洏绫诲瀷
/// </summary>
+ [ImporterHeader(Name = "鎵樼洏绫诲瀷")]
[SugarColumn(IsNullable = false, ColumnDescription = "鎵樼洏绫诲瀷")]
public int PalletType { get; set; }
@@ -76,7 +77,7 @@
/// </summary>
[ImporterHeader(Name = "璧峰鍦板潃")]
[ExporterHeader(DisplayName = "璧峰鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璧峰鍦板潃")]
+ [SugarColumn(IsNullable = false, Length = 30, ColumnDescription = "璧峰鍦板潃")]
public string SourceAddress { get; set; }
/// <summary>
@@ -84,7 +85,7 @@
/// </summary>
[ImporterHeader(Name = "鐩爣鍦板潃")]
[ExporterHeader(DisplayName = "鐩爣鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鐩爣鍦板潃")]
+ [SugarColumn(IsNullable = false, Length = 30, ColumnDescription = "鐩爣鍦板潃")]
public string TargetAddress { get; set; }
/// <summary>
@@ -92,7 +93,7 @@
/// </summary>
[ImporterHeader(Name = "褰撳墠浣嶇疆")]
[ExporterHeader(DisplayName = "褰撳墠浣嶇疆")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")]
+ [SugarColumn(IsNullable = false, Length = 30, ColumnDescription = "褰撳墠浣嶇疆")]
public string CurrentAddress { get; set; }
/// <summary>
@@ -100,7 +101,7 @@
/// </summary>
[ImporterHeader(Name = "涓嬩竴鍦板潃")]
[ExporterHeader(DisplayName = "涓嬩竴鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")]
+ [SugarColumn(IsNullable = false, Length = 30, ColumnDescription = "涓嬩竴鍦板潃")]
public string NextAddress { get; set; }
/// <summary>
@@ -108,7 +109,7 @@
/// </summary>
[ImporterHeader(Name = "浠撳簱涓婚敭")]
[ExporterHeader(DisplayName = "浠撳簱涓婚敭")]
- [SugarColumn(IsNullable = true, ColumnDescription = "浠撳簱涓婚敭")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
public int WarehouseId { get; set; }
/// <summary>
@@ -134,7 +135,20 @@
[ExporterHeader(DisplayName = "浠诲姟涓嬪彂鏃堕棿")]
[SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟涓嬪彂鏃堕棿")]
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>
@@ -142,5 +156,26 @@
[ExporterHeader(DisplayName = "澶囨敞")]
[SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡缂栧彿")]
+ [ExporterHeader(DisplayName = "鐗╂枡缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏁伴噺
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡鏁伴噺")]
+ [ExporterHeader(DisplayName = "鐗╂枡鏁伴噺")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "鐗╂枡鏁伴噺")]
+ public float Quantity { get; set; }
+ /// <summary>
+ /// 鐗╂枡鎵规
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡鎵规")]
+ [ExporterHeader(DisplayName = "鐗╂枡鎵规")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
+ public string BatchNo { get; set; }
}
}
--
Gitblit v1.9.3