提交代码

WCS.BLL/DbModels/OutOrder.cs

@@ -1,4 +1,5 @@
 using SqlSugar;
+using WCS.Model.ApiModel.OutStore;
 
 namespace WCS.BLL.DbModels
 {
@@ -24,7 +25,14 @@ namespace WCS.BLL.DbModels
         /// 单据状态
         /// </summary>           
         [SugarColumn(ColumnName = "order_status", IsNullable = false, ColumnDescription = "单据状态")]
-        public OutOrderStatus OrderStatus { get; set; } = OutOrderStatus.未出库;
+        public OutOrderStatus OrderStatus { get; set; } = OutOrderStatus.未发料;
+
+        /// <summary>
+        /// 单据执行状态：	待发料，	开始发料，	暂停发料，	发料完成
+        /// </summary>           
+        [SugarColumn(ColumnName = "order_exe_status", IsNullable = true, ColumnDescription = "执行状态：\t待发料，\t开始发料，\t暂停发料，\t发料完成")]
+        public OutOrderExeStatus OutOrderExeStatus { get; set; } = OutOrderExeStatus.待发料;
+
 
         /// <summary>
         /// 单据来源
@@ -41,8 +49,8 @@ namespace WCS.BLL.DbModels
         /// <summary>
         /// 单据同步类型
         /// </summary>           
-        [SugarColumn(ColumnName = "sync_type", Length = 50, IsNullable = true, ColumnDescription = "单据同步类型：ByMatCode,ByMatSn")]
-        public string SyncType { get; set; } = string.Empty;
+        [SugarColumn(ColumnName = "sync_type",IsNullable = false, ColumnDescription = "单据同步类型：ByMatCode,ByMatSn")]
+        public SyncTypeEnum SyncType { get; set; } 
 
         /// <summary>
         /// 创建时间
@@ -56,13 +64,17 @@ namespace WCS.BLL.DbModels
         [SugarColumn(ColumnName = "create_user", Length = 100, IsNullable = true, ColumnDescription = "操作员")]
         public string CreateUser { get; set; }
 
-    }
+        /// <summary>
+        /// 用于绑定DataGrid中是否选择
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public bool IsSelected { get; set; }
 
-    public enum OutOrderStatus
-    {
-        未出库 = 0,
-        部分出库 = 1,
-        全部出库 = 2
+        /// <summary>
+        /// 用于绑定中显示序号
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public int RowNumber { get; set; }
     }
 
 }