新增暂存在途字段

AutoTurnOver.DB/daily.cs

@@ -287,6 +287,11 @@ sum(t1.occupy_order_private) as 'occupy_order_private',
 sum(t1.occupy_order_share) as 'occupy_order_share',
 sum(t1.occupy_order) as 'occupy_order',
 
+sum(t4.quantity_transfer_order) as 'quantity_transfer_order',
+sum(t4.quantity_transfer_temp_schedule) as 'quantity_transfer_temp_schedule',
+sum(t4.quantity_transfer_temporary_storage) as 'quantity_transfer_temporary_storage',
+
+
 sum(t4.quantity_purchase * t3.unit_price) as 'realtime_amount_purchase',
 sum(t4.quantity_transfer * t3.unit_price) as 'realtime_amount_transfer',
 sum(t4.quantity_unshipped) as 'quantity_unshipped',
@@ -325,7 +330,13 @@ t3.sku_title_cn as 'base_sku_name',
 t4.quantity_purchase as 'purchase_daily_quantity',
 t3.buyer_name,t3.sku_title_en,t3.product_inner_code as 'sku_product_inner_code',
 t3.category_simple_name,
-t4.quantity_purchase as 'realtime_quantity_purchase',t4.quantity_transfer as 'realtime_quantity_transfer',
+t4.quantity_purchase as 'realtime_quantity_purchase',
+t4.quantity_transfer as 'realtime_quantity_transfer',
+
+t4.quantity_transfer_order as 'quantity_transfer_order',
+t4.quantity_transfer_temp_schedule as 'quantity_transfer_temp_schedule',
+t4.quantity_transfer_temporary_storage as 'quantity_transfer_temporary_storage',
+
 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',

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -69,6 +69,11 @@ t7.first_inbound_date,
 t3.area_name,
 -- ifnull(t15.count,0) as 'not_trans_count',
 
+t13.quantity_transfer_order as 'quantity_transfer_order',
+t13.quantity_transfer_temp_schedule as 'quantity_transfer_temp_schedule',
+t13.quantity_transfer_temporary_storage as 'quantity_transfer_temporary_storage',
+
+
 t13.quantity_land_purchase as 'quantity_land_purchase',
 t13.quantity_ocean_purchase as 'quantity_ocean_purchase',
 t13.quantity_air_purchase as 'quantity_air_purchase',

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -437,6 +437,20 @@ namespace AutoTurnOver.Models
     public class dc_auto_turnover_list_dto
     {
         /// <summary>
+        /// 调拨单在途
+        /// </summary>
+        public int quantity_transfer_order { get; set; }
+
+        /// <summary>
+        /// 调拨单采购临时数据
+        /// </summary>
+        public int quantity_transfer_temp_schedule { get; set; }
+
+        /// <summary>
+        /// 调拨在途，暂存
+        /// </summary>
+        public int quantity_transfer_temporary_storage { get; set; }
+        /// <summary>
         /// 待调拨数量
         /// </summary>
         public int not_trans_count { get; set; }

AutoTurnOver.Models/dc_base_stock.cs

@@ -171,6 +171,21 @@ namespace AutoTurnOver.Models
         public decimal storage_quantity { get; set; }
 
         /// <summary>
+        /// 调拨单在途
+        /// </summary>
+        public int quantity_transfer_order { get; set; }
+
+        /// <summary>
+        /// 调拨单采购临时数据
+        /// </summary>
+        public int quantity_transfer_temp_schedule { get; set; }
+
+        /// <summary>
+        /// 调拨在途，暂存
+        /// </summary>
+        public int quantity_transfer_temporary_storage { get; set; }
+
+        /// <summary>
         /// 待调拨数量
         /// </summary>
         public decimal not_trans_count { get; set; }

AutoTurnOver.Services/DailyServices.cs

@@ -159,7 +159,9 @@ namespace AutoTurnOver.Services
                     if (list == null || list.Count <= 0) break;
 
                     DataTable table = new DataTable();
-                    string[] cols = new string[] { "百伦简易分类","Sku", "采购名称", "中文名","内部编码", "仓库编码", "仓库名称", "货主编码","实时采购在途","实时调拨在途","待调拨数量","在途金额"
+                    string[] cols = new string[] { "百伦简易分类","Sku", "采购名称", "中文名","内部编码", "仓库编码", "仓库名称", "货主编码","实时采购在途",
+                       "实时调拨在途(总)","实时调拨在途(调拨单)","实时调拨在途(采购临时)","实时调拨在途(暂存)"
+                        ,"在途金额"
                 ,"订货数量","运输在途","中转仓库存","冻结库存","供应商库存","预售库存","不良品库存","在途库存","收货待检"
                  ,"待上架","可配库存","上周销量","上周销售额","入库数量","可配库存金额","销售可用库存(聚合)","销售可用库存(私有)","销售可用库存(共享)","在仓库存(共享)","在仓库存(私有)","在仓库存(聚合)","仓库占用(共享)"
                   ,"仓库占用(私有)","仓库占用(聚合)","活动占用","单占用(私有)","订单占用(共享)","订单占用(聚合)","环球更新时间","供应商","采购员","重量","单价","已发货库存","实时缺货","是否侵权",
@@ -182,7 +184,6 @@ namespace AutoTurnOver.Services
                         //row["英文名称"] = itemData.sku_title_en;
                         row["内部编码"] = itemData.sku_product_inner_code;
                         row["仓库编码"] = itemData.warehouse_code;
-                        row["待调拨数量"] = itemData.not_trans_count;
                         row["仓库名称"] = itemData.warehouse_name;
                         row["货主编码"] = itemData.owner_code;
                         row["订货数量"] = itemData.quantity_reservation;
@@ -213,7 +214,12 @@ namespace AutoTurnOver.Services
                         row["环球更新时间"] = itemData.update_time;
 
                         row["实时采购在途"] = itemData.realtime_quantity_purchase;
-                        row["实时调拨在途"] = itemData.realtime_quantity_transfer;
+
+                        row["实时调拨在途(总)"] = itemData.realtime_amount_transfer;
+                        row["实时调拨在途(调拨单)"] = itemData.quantity_transfer_order;
+                        row["实时调拨在途(采购临时)"] = itemData.quantity_transfer_temp_schedule;
+                        row["实时调拨在途(暂存)"] = itemData.quantity_transfer_temporary_storage;
+
                         row["在途金额"] = itemData.on_the_way_stock_amount;
                         row["供应商"] = itemData.suppliers_name;
                         row["采购员"] = itemData.buyer_name;

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -297,7 +297,9 @@ namespace AutoTurnOver.Services
                 if (list == null || list.Count <= 0) break;
                 DataTable table = new DataTable();
                 string[] cols = new string[] { "Sku","商品编码", "内部编码", "sku标题", "仓库编码", "仓库名称","仓库所在国家", "MOQ",
-                "采购在途", "调拨在途","待调拨数量", "昨日销量", "明日销量", "未来7天日均", "未来14天日均", "建议采购数", "活动促销数量",
+                "采购在途",
+                    "调拨在途(总)","调拨在途(调拨单","调拨在途(采购临时)","调拨在途(暂存)",
+                    "昨日销量", "明日销量", "未来7天日均", "未来14天日均", "建议采购数", "活动促销数量",
                 "实际库存", "安全库存", "周转天数", "供应商交期", "质检入库天数", "调拨头程天数", "预测是否断货", "缺货数量","监控状态","供应商","采购员","交期异常",
                 "过去7天日均","过去14天日均","过去30天日均","重量","单价","实时库存","ebay最近7天日均销量","ebay最近14天日均销量","ebay最近30天日均销量"
                 ,"速卖通最近7天日均销量","速卖通最近14天日均销量","速卖通最近30天日均销量"
@@ -316,7 +318,7 @@ namespace AutoTurnOver.Services
                     row["计算时间"] = itemData.gmt_modified.ToString("yyyy-MM-dd");
                     row["默认头程运输方式"] = itemData.head_transport_type;
                     row["默认头程渠道"] = itemData.head_transport_logistics_code;
-                    row["待调拨数量"] = itemData.not_trans_count;
+
 
                     row["仓库所在国家"] = itemData.area_name;
                     row["销量预测规则"] = itemData.dc_auto_sales_forecast_title;
@@ -337,7 +339,12 @@ namespace AutoTurnOver.Services
                     row["仓库名称"] = itemData.warehouse_name;
                     row["MOQ"] = itemData.quantity_minimum_order;
                     row["采购在途"] = itemData.quantity_purchase;
-                    row["调拨在途"] = itemData.quantity_transfer;
+
+                    row["调拨在途(总)"] = itemData.quantity_transfer;
+                    row["调拨在途(调拨单)"] = itemData.quantity_transfer_order;
+                    row["调拨在途(采购临时)"] = itemData.quantity_transfer_temp_schedule;
+                    row["调拨在途(暂存)"] = itemData.quantity_transfer_temporary_storage;
+
                     row["昨日销量"] = itemData.oneday_sales;
                     row["明日销量"] = itemData.forecast_oneday_sales2;
                     row["未来7天日均"] = itemData.forecast_sevenday_sales;