Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYua...

huanghongfeng

2024-05-20 cb62fe00ff0c80bce983b0aa7a2b320fdc26f85f

 ´úÂë¹ÜÀí/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>
@@ -73,6 +73,7 @@
        //[Required(AllowEmptyStrings = false)]
        public string agv_TrayStatus { get; set; }


        /// <summary>
        ///任务状态
        /// </summary>
@@ -80,16 +81,16 @@
        [MaxLength(20)]
        [Column(TypeName = "nvarchar(20)")]
        [Editable(true)]
        [Required(AllowEmptyStrings = false)]
        //[Required(AllowEmptyStrings = false)]
        public string agv_taskstate { get; set; }

        /// <summary>
        ///工单类型
        ///工单类型 (17-机加工 28-检测线 101移库外协)
        /// </summary>
        [Display(Name = "AGV工作类型")]
        [Column(TypeName = "int")]
        [Editable(true)]
        public int agv_worktype { get; set; }
        public int? agv_worktype { get; set; }

        /// <summary>
        ///物料类型
@@ -98,7 +99,6 @@
        [MaxLength(50)]
        [Column(TypeName = "nvarchar(50)")]
        [Editable(true)]
        [Required(AllowEmptyStrings = false)]
        public string agv_materielid { get; set; }

        /// <summary>
@@ -107,8 +107,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>
        ///创建时间
@@ -116,13 +134,13 @@
        [Display(Name = "创建时间")]
        [Column(TypeName = "datetime")]
        [Editable(true)]
        [Required(AllowEmptyStrings = false)]
        //[Required(AllowEmptyStrings = false)]
        public DateTime agv_createtime { get; set; }

        /// <summary>
        ///下发时间
        ///执行时间
        /// </summary>
        [Display(Name = "下发时间")]
        [Display(Name = "执行时间")]
        [Column(TypeName = "datetime")]
        [Editable(true)]
        public DateTime? agv_realesstime { get; set; }
@@ -142,7 +160,7 @@
        [MaxLength(50)]
        [Column(TypeName = "nvarchar(50)")]
        [Editable(true)]
        [Required(AllowEmptyStrings = false)]
        //[Required(AllowEmptyStrings = false)]
        public string agv_tasktype { get; set; }

        /// <summary>
@@ -155,7 +173,7 @@
        public string agv_remark { get; set; }

        /// <summary>
        ///任务等级
        ///任务等级  0：暂缓1：正常2：加急 3：特急
        /// </summary>
        [Display(Name = "任务等级")]
        [Column(TypeName = "int")]
@@ -174,7 +192,7 @@
        /// <summary>
        ///托盘类型/托盘码
        /// </summary>
        [Display(Name = "托盘码")]
        [Display(Name = "托盘类型")]
        [MaxLength(30)]
        [Column(TypeName = "nvarchar(30)")]
        [Editable(true)]