实时库存新增 采购，调拨的海陆空铁路运输在途

AutoTurnOver.DB/daily.cs

@@ -338,6 +338,15 @@ t4.quantity_transfer_temp_schedule as 'quantity_transfer_temp_schedule',
 t4.quantity_transfer_temporary_storage as 'quantity_transfer_temporary_storage',
 t6.abroad_inbound_delivery as 'abroad_inbound_delivery',
 
+t4.quantity_land_purchase as 'quantity_land_purchase',
+t4.quantity_ocean_purchase as 'quantity_ocean_purchase',
+t4.quantity_air_purchase as 'quantity_air_purchase',
+t4.quantity_railway_purchase as 'quantity_railway_purchase',
+t4.quantity_land_transfer as 'quantity_land_transfer',
+t4.quantity_ocean_transfer as 'quantity_ocean_transfer',
+t4.quantity_ocean_transfer as 'quantity_ocean_transfer',
+t4.quantity_railway_transfer as 'quantity_railway_transfer',
+
 t1.bailun_sku,t1.warehouse_code,t4.quantity_out_stock,t4.gmt_out_stock_modified,t3.weight,t3.unit_price,
 (case when t5.id is null then '未侵权' else  '侵权' end) as 'has_tort',
 ( case when t7.`status`=0 or t7.`status` is null then 0 else 1 end ) as 'monitor_status',
@@ -648,8 +657,6 @@ left join dc_mid_transit as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse
 left join (select ts1.bailun_sku,ts1.usable_stock  from dc_base_stock as ts1  where ts1.bailun_sku in (select bailun_sku from dc_config_fba_extend ) and ts1.warehouse_code='GZBLWH') as ts1 on t1.bailun_sku = ts1.bailun_sku
 left join (select ts1.bailun_sku,ts1.usable_stock  from dc_base_stock as ts1  where ts1.bailun_sku in (select bailun_sku from dc_config_fba_extend ) and ts1.warehouse_code='GZBLZZG') as ts2 on t1.bailun_sku = ts2.bailun_sku
 
-
-
 ";
                 if (search_data.has_tort != null)
                 {
@@ -670,7 +677,17 @@ t6.quantity_purchase,t6.quantity_transfer,t6.quantity_transfer_order,t6.quantity
 ts1.usable_stock as 'usable_stock_01',ts2.usable_stock as 'usable_stock_02', t2.usable_stock,
 ((t6.quantity_purchase+t6.quantity_transfer)*t3.unit_price) as 'sum_mid_amount',( t2.usable_stock*t3.unit_price) as 'usable_stock_amount',
 ((ifnull(t6.quantity_purchase,0)+ifnull(t6.quantity_transfer,0)+t2.usable_stock)*t3.unit_price) as 'sum_amount',
-((ifnull(t6.quantity_purchase,0)+ifnull(t6.quantity_transfer,0)+t2.usable_stock)) as 'sum_stock'
+((ifnull(t6.quantity_purchase,0)+ifnull(t6.quantity_transfer,0)+t2.usable_stock)) as 'sum_stock',
+
+t6.quantity_land_purchase as 'quantity_land_purchase',
+t6.quantity_ocean_purchase as 'quantity_ocean_purchase',
+t6.quantity_air_purchase as 'quantity_air_purchase',
+t6.quantity_railway_purchase as 'quantity_railway_purchase',
+t6.quantity_land_transfer as 'quantity_land_transfer',
+t6.quantity_ocean_transfer as 'quantity_ocean_transfer',
+t6.quantity_ocean_transfer as 'quantity_ocean_transfer',
+t6.quantity_railway_transfer as 'quantity_railway_transfer'
+
 from dc_config_fba_extend as t1
 left JOIN dc_base_stock as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
 left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku

AutoTurnOver.Models/dc_base_stock.cs

@@ -167,6 +167,14 @@ namespace AutoTurnOver.Models
 
     public class dc_base_stock_dto : dc_base_stock
     {
+        public int quantity_land_purchase { get; set; }
+        public int quantity_ocean_purchase { get; set; }
+        public int quantity_air_purchase { get; set; }
+        public int quantity_railway_purchase { get; set; }
+        public int quantity_land_transfer { get; set; }
+        public int quantity_ocean_transfer { get; set; }
+        public int quantity_air_transfer { get; set; }
+        public int quantity_railway_transfer { get; set; }
         /// <summary>
         /// 入库数
         /// </summary>
@@ -386,6 +394,15 @@ namespace AutoTurnOver.Models
 
     public class dc_base_stock_fba_dto
     {
+
+        public int quantity_land_purchase { get; set; }
+        public int quantity_ocean_purchase { get; set; }
+        public int quantity_air_purchase { get; set; }
+        public int quantity_railway_purchase { get; set; }
+        public int quantity_land_transfer { get; set; }
+        public int quantity_ocean_transfer { get; set; }
+        public int quantity_air_transfer { get; set; }
+        public int quantity_railway_transfer { get; set; }
         public string bailun_account { get; set; }
         public decimal? sum_stock { get; set; }
         public string web_site { get; set; }

AutoTurnOver.Services/DailyServices.cs

@@ -244,7 +244,8 @@ namespace AutoTurnOver.Services
                  ,"待上架","可配库存","在途+可配总库存","上周销量","上周销售额","入库数量","可配库存金额","销售可用库存(聚合)","销售可用库存(私有)","销售可用库存(共享)","在仓库存(共享)","在仓库存(私有)","在仓库存(聚合)","仓库占用(共享)"
                   ,"仓库占用(私有)","仓库占用(聚合)","活动占用","单占用(私有)","订单占用(共享)","订单占用(聚合)","环球更新时间","供应商","采购员","重量","单价","已发货库存","实时缺货","是否侵权",
                   "过去7日日均销量", "过去14日日均销量", "过去30日日均销量", "过去7日Eaby日均销量", "过去14日Eaby日均销量", "过去30日Eaby日均销量", "过去7日速卖通日均销量", "过去14日速卖通日均销量", "过去30日速卖通日均销量",
-                        "监控状态","开发时间","昨日销量","停售状态","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量","moq","品牌","标签","类型","产品尺寸","包装尺寸","安全库存","销售员","海外仓入库天数"
+                        "监控状态","开发时间","昨日销量","停售状态","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量","moq","品牌","标签","类型","产品尺寸","包装尺寸","安全库存","销售员","海外仓入库天数",
+                        "采购陆运在途","采购海运在途","采购空运在途","采购铁路在途","调拨陆运在途","调拨海运在途","调拨空运在途","调拨铁路在途"
             };
                     foreach (var item in cols)
                     {
@@ -254,6 +255,16 @@ namespace AutoTurnOver.Services
                     foreach (var itemData in list)
                     {
                         DataRow row = table.NewRow();
+                        row["采购陆运在途"] = itemData.quantity_land_purchase;
+                        row["采购海运在途"] = itemData.quantity_ocean_purchase;
+                        row["采购空运在途"] = itemData.quantity_air_purchase;
+                        row["采购铁路在途"] = itemData.quantity_railway_purchase;
+                        row["调拨陆运在途"] = itemData.quantity_land_transfer;
+                        row["调拨海运在途"] = itemData.quantity_ocean_transfer;
+                        row["调拨空运在途"] = itemData.quantity_air_transfer;
+                        row["调拨铁路在途"] = itemData.quantity_railway_transfer;
+
+
                         row["百伦简易分类"] = itemData.category_simple_name;
                         row["海外仓入库天数"] = itemData.abroad_inbound_delivery;
                         row["Sku"] = itemData.bailun_sku;
@@ -384,7 +395,8 @@ namespace AutoTurnOver.Services
                         ,"昨日review分数","昨日reivew个数","仓库编码","仓库名称","国家"
                         ,"昨日销量","昨日销售额USD","近7天销量","近7天销售额USD","近30天销量","近30天销售额USD","监控状态","采购员","采购价","重量"
                         ,"实时采购在途","实时调拨在途(总)","实时调拨在途(调拨单)","实时调拨在途(采购临时)","实时调拨在途(暂存)","总在途数","广州01仓可用库存","广州02仓可用库存","FBA 可售库存"
-                        ,"在途金额","可配库存金额","在途+可配总库存"
+                        ,"在途金额","可配库存金额","在途+可配总库存",
+                        "采购陆运在途","采购海运在途","采购空运在途","采购铁路在途","调拨陆运在途","调拨海运在途","调拨空运在途","调拨铁路在途"
 
             };
                     foreach (var item in cols)
@@ -395,6 +407,15 @@ namespace AutoTurnOver.Services
                     foreach (var itemData in list)
                     {
                         DataRow row = table.NewRow();
+                        row["采购陆运在途"] = itemData.quantity_land_purchase;
+                        row["采购海运在途"] = itemData.quantity_ocean_purchase;
+                        row["采购空运在途"] = itemData.quantity_air_purchase;
+                        row["采购铁路在途"] = itemData.quantity_railway_purchase;
+                        row["调拨陆运在途"] = itemData.quantity_land_transfer;
+                        row["调拨海运在途"] = itemData.quantity_ocean_transfer;
+                        row["调拨空运在途"] = itemData.quantity_air_transfer;
+                        row["调拨铁路在途"] = itemData.quantity_railway_transfer;
+
                         row["账号"] = itemData.bailun_account;
                         row["站点"] = itemData.web_site;
                         row["asin"] = itemData.asin;