B端订单增加IntoStockType，订单Sku增加是否验收

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -111,6 +111,7 @@ namespace BBWYB.Server.Business
                 BuyerAccount = o.BuyerAccount,
                 InPackAmount = o.InPackAmount,
                 IsWaitPack = o.IsWaitPack,
+                IntoStoreType = o.IntoStoreType,
 
                 ContactName = ocs.ContactName,
                 Address = ocs.Address,

BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@@ -126,6 +126,9 @@ namespace BBWYB.Server.Business.Sync
 
                                 if (jobject.ContainsKey("BelongSkus"))
                                     belongSkus = jobject["BelongSkus"] as JArray;
+
+                                if (jobject.ContainsKey("IntoStoreType"))
+                                    dbOrder.IntoStoreType = (Enums.IntoStoreType?)jobject.Value<int?>("IntoStoreType");
                             }
                             catch (Exception ex)
                             {

BBWYB.Server.Model/Db/Order/Order.cs

@@ -248,6 +248,10 @@ namespace BBWYB.Server.Model.Db
         /// </summary>
         [Column(DbType = "bit")]
         public bool? IsWaitPack { get; set; } = false;
+
+
+        [Column(MapType = typeof(int?))]
+        public Enums.IntoStoreType? IntoStoreType { get; set; }
     }
 
 }

BBWYB.Server.Model/Db/Order/OrderSku.cs

@@ -7,67 +7,68 @@ namespace BBWYB.Server.Model.Db
     /// 订单SKU
     /// </summary>
     [Table(Name = "ordersku", DisableSyncStructure = true)]
-	public partial class OrderSku {
+    public partial class OrderSku
+    {
 
-		[Column(IsPrimary = true)]
+        [Column(IsPrimary = true)]
-		public long Id { get; set; }
+        public long Id { get; set; }
 
-		[Column(DbType = "datetime")]
+        [Column(DbType = "datetime")]
-		public DateTime? CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// 是否退款
+        /// 是否退款
-		/// </summary>
+        /// </summary>
-		
+
-		public bool? IsRefund { get; set; } = false;
+        public bool? IsRefund { get; set; } = false;
+
+        /// <summary>
+        /// 销售数量
+        /// </summary>
+        [Column(DbType = "int(1)")]
+        public int? ItemTotal { get; set; }
+
+        /// <summary>
+        /// Logo
+        /// </summary>
+        public string Logo { get; set; }
 
-		/// <summary>
-		/// 销售数量
-		/// </summary>
-		[Column(DbType = "int(1)")]
-		public int? ItemTotal { get; set; }
 
-		/// <summary>
+        [Column(StringLength = 50)]
-		/// Logo
+        public string OrderId { get; set; }
-		/// </summary>
-		public string Logo { get; set; }
 
+        /// <summary>
+        /// 销售单价
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal? Price { get; set; }
 
-		[Column(StringLength = 50)]
+        [Column(StringLength = 50)]
-		public string OrderId { get; set; }
+        public string ProductId { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// 销售单价
+        /// 货号
-		/// </summary>
+        /// </summary>
-		[Column(DbType = "decimal(20,2)")]
+        [Column(StringLength = 50)]
-		public decimal? Price { get; set; }
+        public string ProductNo { get; set; }
 
-		[Column(StringLength = 50)]
-		public string ProductId { get; set; }
 
-		/// <summary>
+        public long? ShopId { get; set; }
-		/// 货号
-		/// </summary>
-		[Column(StringLength = 50)]
-		public string ProductNo { get; set; }
 
-		
+        [Column(StringLength = 50, IsNullable = false)]
-		public long? ShopId { get; set; }
+        public string SkuId { get; set; }
 
-		[Column(StringLength = 50, IsNullable = false)]
+        /// <summary>
-		public string SkuId { get; set; }
+        /// 归属SkuId
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string BelongSkuId { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// 归属SkuId
+        /// Sku标题
-		/// </summary>
+        /// </summary>
-		[Column(StringLength = 50)]
-		public string BelongSkuId { get; set; }
 
-		/// <summary>
+        public string Title { get; set; }
-		/// Sku标题
-		/// </summary>
-		
-		public string Title { get; set; }
 
 
         /// <summary>
@@ -76,23 +77,29 @@ namespace BBWYB.Server.Model.Db
         [Column(DbType = "int(1)", MapType = typeof(int?))]
         public Enums.PackConfigState? PackConfigState { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// 买家支付运费
+        /// 买家支付运费
-		/// </summary>
+        /// </summary>
-		[Column(DbType = "decimal(20,2)")]
+        [Column(DbType = "decimal(20,2)")]
-		public decimal? BuyerPayFreight { get; set; } = 0.00M;
+        public decimal? BuyerPayFreight { get; set; } = 0.00M;
-
+
-		/// <summary>
+        /// <summary>
-		/// 实收打包费
+        /// 实收打包费
-		/// </summary>
+        /// </summary>
-		[Column(DbType = "decimal(20,2)")]
+        [Column(DbType = "decimal(20,2)")]
-		public decimal? InPackAmount { get; set; } = 0.00M;
+        public decimal? InPackAmount { get; set; } = 0.00M;
-
+
-		/// <summary>
+        /// <summary>
-		/// SKU备注
+        /// SKU备注
-		/// </summary>
+        /// </summary>
-		[Column(StringLength = 500)]
+        [Column(StringLength = 500)]
-		public string Remark { get; set; }
+        public string Remark { get; set; }
-	}
+
+        /// <summary>
+        /// 是否验收
+        /// </summary>
+        [Column(DbType = "bit", IsNullable = true)]
+        public bool? IsCheck { get; set; }
+    }
 
 }

BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs

@@ -145,6 +145,8 @@
         /// 打包状态
         /// </summary>
         public Enums.PackConfigState? PackConfigState { get; set; }
+
+        public Enums.IntoStoreType? IntoStoreType { get; set; }
     }
 
     public class OrderListResponse

BBWYB.Server.Model/Enums.cs

@@ -307,5 +307,13 @@
             待配置 = 0,
             已配置 = 1
         }
+
+        /// <summary>
+        /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1)
+        /// </summary>
+        public enum IntoStoreType
+        {
+            发回齐越 = 0, 厂商代发入仓 = 1
+        }
     }
 }