在途数拆分成采购在途，调拨在途，调拨计划在途

Bailun.DC.Models/Api/mSkuStock.cs

@@ -61,5 +61,19 @@ namespace Bailun.DC.Models.Api
         /// </summary>
         public int? thirtyday_average_sales { get; set; }
 
+
+        //采购在途
+        public int? purchase_transfer { get; set; }
+
+        /// <summary>
+        /// 调拨在途
+        /// </summary>
+        public int? allot_transfer { get; set; }
+
+        /// <summary>
+        /// 调拨计划在途
+        /// </summary>
+        public int? allot_plan_transfer { get; set; }
+
     }
 }

Bailun.DC.Models/Ebay/dc_base_ebay_sku_ratio.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    /// <summary>
+    /// ebay 费用 itemid 和百伦sku关系表
+    /// </summary>
+    public class dc_base_ebay_sku_ratio
+    {
+        public int id { get; set; }
+
+        public string item_id { get; set; }
+
+        public string sku_code { get; set; }
+
+        public int sku_count { get; set; }
+
+        public decimal sku_ratio { get; set; }
+
+        public decimal sku_price { get; set; }
+
+    }
+}

Bailun.DC.Services/WareHouseServices.cs

@@ -1111,7 +1111,7 @@ namespace Bailun.DC.Services
                     cn.Open();
                 }
 
-                var sql = $@"select t1.warehouse_code,t2.warehouse_name,t2.hq_type,t1.bailun_sku,t1.usable_stock,(t1.usable_stock*t3.unit_price) amount,(t4.quantity_purchase+t4.quantity_transfer+t4.quantity_transfer_plan) as count_transfer,t4.quantity_out_stock,t5.oneday_total_sales,t5.sevenday_average_sales,t5.thirtyday_average_sales from dc_base_stock t1
+                var sql = $@"select t1.warehouse_code,t2.warehouse_name,t2.hq_type,t1.bailun_sku,t1.usable_stock,(t1.usable_stock*t3.unit_price) amount,t4.quantity_purchase as purchase_transfer,t4.quantity_transfer as allot_transfer,t4.quantity_transfer_plan as allot_plan_transfer,t4.quantity_out_stock,t5.oneday_total_sales,t5.sevenday_average_sales,t5.thirtyday_average_sales from dc_base_stock t1
                             join dc_base_warehouse t2 on t1.warehouse_code=t2.warehouse_code
                             join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku
                             left join dc_mid_transit t4 on t1.bailun_sku=t4.bailun_sku and t1.warehouse_code=t4.warehouse_code

Bailun.DC.Web/Controllers/ApiController.cs

@@ -814,7 +814,10 @@ namespace Bailun.DC.Web.Controllers
                         warehousetype = a.hq_type,
                         a.usable_stock,
                         a.amount,
-                        count_transfer = a.count_transfer??0,
+                        //count_transfer = a.count_transfer??0,
+                        purchase_transfer = a.purchase_transfer??0,
+                        allot_plan_transfer = a.allot_plan_transfer??0,
+                        allot_transfer = a.allot_transfer??0,
                         quantity_out_stock = a.quantity_out_stock??0,
                         oneday_total_sales = a.oneday_total_sales??0,
                         sevenday_average_sales = a.sevenday_average_sales??0,