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/Taskinfo/dt_agvtask_hty.cs | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs"
index 7d395a2..084c88f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs"
@@ -52,7 +52,6 @@
[MaxLength(50)]
[Column(TypeName = "nvarchar(50)")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
public string agv_materielid { get; set; }
/// <summary>
@@ -61,8 +60,26 @@
[Display(Name = "鏁伴噺")]
[Column(TypeName = "int")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
+ //[Required(AllowEmptyStrings = false)]
public int? agv_qty { get; set; }
+
+ /// <summary>
+ ///璧风偣鏁伴噺
+ /// </summary>
+ [Display(Name = "璧风偣鏁伴噺")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ //[Required(AllowEmptyStrings = false)]
+ public int StarQuantity { get; set; } = 0;
+
+ /// <summary>
+ ///缁堢偣鏁伴噺
+ /// </summary>
+ [Display(Name = "缁堢偣鏁伴噺")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ //[Required(AllowEmptyStrings = false)]
+ public int EndQuantity { get; set; } = 0;
/// <summary>
///鍒涘缓鏃堕棿
@@ -174,24 +191,33 @@
public string agv_userid { get; set; }
/// <summary>
- ///鎵樼洏鐮�
+ ///鎵樼洏绫诲瀷/鎵樼洏鐮�
/// </summary>
[Display(Name = "鎵樼洏鐮�")]
[MaxLength(30)]
[Column(TypeName = "nvarchar(30)")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
- public string agv_barcode { get; set; }
+ //[Required(AllowEmptyStrings = false)]
+ public string agv_Traytype { get; set; }
/// <summary>
///AGV缂栧彿
/// </summary>
- [Display(Name = "AGV缂栧彿")]
+ //[Display(Name = "AGV缂栧彿")]
+ //[MaxLength(50)]
+ //[Column(TypeName = "nvarchar(50)")]
+ //[Editable(true)]
+ //[Required(AllowEmptyStrings = false)]
+ //public string agv_code { get; set; }
+ /// <summary>
+ ///鎵樼洏鐘舵��
+ /// </summary>
+ [Display(Name = "鎵樼洏鐘舵��")]
[MaxLength(50)]
[Column(TypeName = "nvarchar(50)")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
- public string agv_code { get; set; }
+ //[Required(AllowEmptyStrings = false)]
+ public string agv_TrayStatus { get; set; }
/// <summary>
///AGV宸ヤ綔绫诲瀷
@@ -199,7 +225,7 @@
[Display(Name = "AGV宸ヤ綔绫诲瀷")]
[Column(TypeName = "int")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
+ //[Required(AllowEmptyStrings = false)]
public int? agv_worktype { get; set; }
/// <summary>
@@ -252,6 +278,12 @@
[Column(TypeName = "nvarchar(500)")]
public string bindSN { get; set; }
-
+ /// <summary>
+ ///宸ュ崟鍙�
+ /// </summary>
+ [Display(Name = "宸ュ崟鍙�")]
+ [Column(TypeName = "nvarchar(40)")]
+ [Editable(true)]
+ public string jobID { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3