Merge branch 'master' of https://gitee.com/cquni-wcs/wcs

WCS.BLL/DbModels/OutOrder.cs

@@ -50,7 +50,14 @@ namespace WCS.BLL.DbModels
         /// 单据同步类型
         /// </summary>           
         [SugarColumn(ColumnName = "sync_type",IsNullable = false, ColumnDescription = "单据同步类型：ByMatCode,ByMatSn")]
-        public SyncTypeEnum SyncType { get; set; } 
+        public SyncTypeEnum SyncType { get; set; }
+
+
+        /// <summary>
+        /// 单据货架类型 ： 单灯单据还是货架单据
+        /// </summary>           
+        [SugarColumn(ColumnName = "shelf_type", IsNullable = false, ColumnDescription = "货架类型 是信息化货架还是智能货架")]
+        public ShelfTypeEnum ShelfType { get; set; }
 
         /// <summary>
         /// 创建时间

WCS.Model/ApiModel/OutStore/OutOrderModel.cs

@@ -62,4 +62,10 @@ namespace WCS.Model.ApiModel.OutStore
         ByMatCode = 0,
         ByMatSn = 1
     }
+
+    public enum ShelfTypeEnum
+    {
+        SmartShelf = 0,
+        SingleLightShelf = 1
+    }
 }