From cb62fe00ff0c80bce983b0aa7a2b320fdc26f85f Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 20 五月 2024 08:51:03 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYuanTaiZhong
---
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs"
index 1b2d904..8acfd0a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs"
@@ -36,7 +36,7 @@
public string stationCode { get; set; }
/// <summary>
- ///鐗╂枡绫诲瀷
+ ///鍥惧彿/鐗╂枡绫诲瀷
/// </summary>
[Display(Name = "鐗╂枡绫诲瀷")]
[MaxLength(25)]
@@ -51,7 +51,7 @@
[MaxLength(15)]
[Column(TypeName = "nvarchar(15)")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
+ //[Required(AllowEmptyStrings = false)]//鏄惁蹇呭～
public string area { get; set; }
/// <summary>
@@ -60,7 +60,7 @@
[Display(Name = "鏄惁鍚敤")]
[Column(TypeName = "bit")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
+ //[Required(AllowEmptyStrings = false)]
public bool enable { get; set; }
/// <summary>
@@ -85,7 +85,7 @@
/// </summary>
[Display(Name = "杞﹁疆鏁伴噺")]
[Column(TypeName = "int")]
- public int? quantity { get; set; }
+ public int quantity { get; set; }
/// <summary>
///杞﹁疆SN鍙�
@@ -139,9 +139,24 @@
///鐐夊彿
/// </summary>
[Display(Name = "鐐夊彿")]
- [Column(TypeName = "int")]
- public int? heatNumber { get; set; }
+ [MaxLength(255)]
+ [Column(TypeName = "nvarchar(255)")]
+ public string heatNumber { get; set; }
+ /// <summary>
+ ///鎵樼洏绫诲瀷
+ /// </summary>
+ [Display(Name = "鎵樼洏绫诲瀷")]
+ [MaxLength(100)]
+ [Column(TypeName = "nvarchar(100)")]
+ public string tray_type { get; set; }
+ /// <summary>
+ ///閽㈠澂鍙�
+ /// </summary>
+ [Display(Name = "閽㈠澂鍙�")]
+ [MaxLength(255)]
+ [Column(TypeName = "nvarchar(255)")]
+ public string billetID { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3