From 11ff4d231e12aa7f7cd2627df5f79b6d2bed5906 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 21 六月 2024 16:17:29 +0800
Subject: [PATCH] 车轮参数信息添加、修改增加条件判断
---
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 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 82a3346..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)]
- 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>
///鍒涘缓鏃堕棿
@@ -103,8 +120,8 @@
///浠诲姟绫诲瀷
/// </summary>
[Display(Name = "浠诲姟绫诲瀷")]
- [MaxLength(50)]
- [Column(TypeName = "nvarchar(50)")]
+ [MaxLength(20)]
+ [Column(TypeName = "nvarchar(20)")]
[Editable(true)]
[Required(AllowEmptyStrings = false)]
public string agv_tasktype { get; set; }
@@ -174,33 +191,42 @@
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; }
+ 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; }
+ public string agv_TrayStatus { get; set; }
/// <summary>
- ///宸ュ崟绫诲瀷
+ ///AGV宸ヤ綔绫诲瀷
/// </summary>
[Display(Name = "AGV宸ヤ綔绫诲瀷")]
[Column(TypeName = "int")]
[Editable(true)]
//[Required(AllowEmptyStrings = false)]
- public int agv_worktype { get; set; }
+ 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