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.cs | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 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.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs"
index 3000592..f28587f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs"
@@ -33,7 +33,7 @@
[MaxLength(50)]
[Column(TypeName = "nvarchar(50)")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
+ //[Required(AllowEmptyStrings = false)]
public string agv_tasknum { get; set; }
/// <summary>
@@ -57,12 +57,22 @@
/// <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>
///浠诲姟鐘舵��
@@ -71,11 +81,11 @@
[MaxLength(20)]
[Column(TypeName = "nvarchar(20)")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
+ //[Required(AllowEmptyStrings = false)]
public string agv_taskstate { get; set; }
/// <summary>
- ///AGV宸ヤ綔绫诲瀷
+ ///宸ュ崟绫诲瀷 (17-鏈哄姞宸� 28-妫�娴嬬嚎 101绉诲簱澶栧崗)
/// </summary>
[Display(Name = "AGV宸ヤ綔绫诲瀷")]
[Column(TypeName = "int")]
@@ -89,7 +99,6 @@
[MaxLength(50)]
[Column(TypeName = "nvarchar(50)")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
public string agv_materielid { get; set; }
/// <summary>
@@ -98,8 +107,26 @@
[Display(Name = "鏁伴噺")]
[Column(TypeName = "int")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
- public int? agv_qty { get; set; }
+ //[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>
///鍒涘缓鏃堕棿
@@ -107,7 +134,7 @@
[Display(Name = "鍒涘缓鏃堕棿")]
[Column(TypeName = "datetime")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
+ //[Required(AllowEmptyStrings = false)]
public DateTime agv_createtime { get; set; }
/// <summary>
@@ -130,10 +157,10 @@
///浠诲姟绫诲瀷
/// </summary>
[Display(Name = "浠诲姟绫诲瀷")]
- [MaxLength(20)]
- [Column(TypeName = "nvarchar(20)")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
[Editable(true)]
- [Required(AllowEmptyStrings = false)]
+ //[Required(AllowEmptyStrings = false)]
public string agv_tasktype { get; set; }
/// <summary>
@@ -146,7 +173,7 @@
public string agv_remark { get; set; }
/// <summary>
- ///浠诲姟绛夌骇
+ ///浠诲姟绛夌骇 0锛氭殏缂�1锛氭甯�2锛氬姞鎬� 3锛氱壒鎬�
/// </summary>
[Display(Name = "浠诲姟绛夌骇")]
[Column(TypeName = "int")]
@@ -163,14 +190,14 @@
public string agv_userid { get; set; }
/// <summary>
- ///鎵樼洏鐮�
+ ///鎵樼洏绫诲瀷/鎵樼洏鐮�
/// </summary>
- [Display(Name = "鎵樼洏鐮�")]
+ [Display(Name = "鎵樼洏绫诲瀷")]
[MaxLength(30)]
[Column(TypeName = "nvarchar(30)")]
[Editable(true)]
//[Required(AllowEmptyStrings = false)]//涓嶈兘涓虹┖
- public string agv_barcode { get; set; }
+ public string agv_Traytype { get; set; }
/// <summary>
///鐗╂枡鐮�
@@ -206,12 +233,12 @@
public DateTime? agv_completeBeginTime { get; set; }
/// <summary>
- ///
+ ///宸ュ崟鍙�
/// </summary>
- [Display(Name = "unitag")]
- [Column(TypeName = "uniqueidentifier")]
+ [Display(Name = "宸ュ崟鍙�")]
+ [Column(TypeName = "nvarchar(40)")]
[Editable(true)]
- public Guid? unitag { get; set; }
+ public string jobID { get; set; }
/// <summary>
///杞﹁疆SN鍙�
--
Gitblit v1.9.3