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_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; }
@@ -190,7 +207,7 @@
        //[MaxLength(50)]
        //[Column(TypeName = "nvarchar(50)")]
        //[Editable(true)]
        ////[Required(AllowEmptyStrings = false)]
        //[Required(AllowEmptyStrings = false)]
        //public string agv_code { get; set; }
        /// <summary>
        ///托盘状态
@@ -203,13 +220,13 @@
        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>
        ///物料码
@@ -261,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; }
    }
}