周转，缺货页面，新增品牌字段

AutoTurnOver.DB/daily.cs

@@ -313,6 +313,7 @@ t6.history_sevenday_sales_ebay,t6.history_fourteenday_sales_ebay,t6.history_thir
 t6.history_sevenday_sales_aliexpress,t6.history_fourteenday_sales_aliexpress,t6.history_thirtyday_sales_aliexpress,
 t6.history_sevenday_sales_amazon,t6.history_fourteenday_sales_amazon,t6.history_thirtyday_sales_amazon,
 t3.moq,
+t3.brand,
 t8.oneday_sales,
 t3.`status` as 'sku_status'
 from 

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -56,6 +56,7 @@ t4.bailun_category_name,
 (t4.supplier_delivery - t6.virtual_delivery_days) as 'delivery_days_error',t4.weight,t4.unit_price,t7.usable_stock,t7.shipped_stock,
 t4.develop_time,(case when t8.id is null then '未侵权' else  '侵权' end) as 'has_tort',
 ( case when t5.`status`=0 or t5.`status` is null then null else t5.gmt_create end ) as 'stop_monitor_create',
+t4.brand as 'brand',
 t4.`status` as 'sku_status'-- ,
 -- t11.label as 'sku_label'
 -- ,t10.`name` as 'group_name'

AutoTurnOver.DB/report.cs

@@ -194,6 +194,7 @@ t1.logistics_method_name,
 (t2.quantity_transfer+t2.quantity_purchase) as 'quantity_ontheway', -- 总在途
 t8.buy_ontheway_detail,
 t9.items,
+t6.brand,
 t1.bailun_sku_quantity_shipped
 from dc_base_oms_sku_outofstock as t1 
 left join dc_mid_transit as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code

AutoTurnOver.Models/Report/quantity_out_stock_detail_dto.cs

@@ -11,6 +11,10 @@ namespace AutoTurnOver.Models.Report
     public class quantity_out_stock_detail_dto
     {
         /// <summary>
+        /// 【品牌
+        /// </summary>
+        public string brand { get; set; }
+        /// <summary>
         /// 缺货更新时间
         /// </summary>
         public DateTime? gmt_out_stock_modified { get; set; }
@@ -163,13 +167,17 @@ namespace AutoTurnOver.Models.Report
         /// 在途数据
         /// </summary>
         public string buy_ontheway_detail { get; set; }
-        public buy_ontheway_detail_dto min_buy { get {
+        public buy_ontheway_detail_dto min_buy
+        {
+            get
+            {
                 if (buy_ontheway_detail_list.Count <= 0) return new buy_ontheway_detail_dto { };
                 else
                 {
                     return buy_ontheway_detail_list.OrderBy(s => s.arrival_date).FirstOrDefault();
                 }
-            } }
+            }
+        }
         public List<buy_ontheway_detail_dto> buy_ontheway_detail_list
         {
             get
@@ -183,7 +191,7 @@ namespace AutoTurnOver.Models.Report
                     var datas = new List<buy_ontheway_detail_dto>();
                     foreach (var buy_str in buy_ontheway_detail.Split(','))
                     {
-                        var temp_sry  = buy_str.Replace("【", "").Replace("】", "");
+                        var temp_sry = buy_str.Replace("【", "").Replace("】", "");
                         var buy_array = temp_sry.Split('|');// Trim() 
                         var buy_array_length = buy_array.Count();
                         if (buy_array_length < 5) continue;
@@ -200,11 +208,11 @@ namespace AutoTurnOver.Models.Report
                                 logistics_order_id = buy_array_length < 7 ? "" : buy_array[6].Trim(),
                             });
                         }
-                        catch(Exception ex)
+                        catch (Exception ex)
                         {
-                            throw new Exception(temp_sry +ex.Message );
+                            throw new Exception(temp_sry + ex.Message);
                         }
-                      
+
                     }
 
                     return datas;
@@ -225,7 +233,7 @@ namespace AutoTurnOver.Models.Report
         /// </summary>
         public string items { get; set; }
     }
-    
+
     public class quantity_out_stock_detail_search_dto
     {
         public int? search_type { get; set; }
@@ -239,7 +247,7 @@ namespace AutoTurnOver.Models.Report
         public string key_words { get; set; }
 
         public string purchase_user { get; set; }
-        public int? bailun_account_id { get; set;}
+        public int? bailun_account_id { get; set; }
         public bool isSum { get; set; }
 
         public DateTime? pay_time_min { get; set; }

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -410,6 +410,7 @@ namespace AutoTurnOver.Models
 
     public class dc_auto_turnover_list_dto
     {
+        public string brand { get; set; }
         public int id { get; set; }
         public string sales_details { get; set; }
         public int? sku_status { get; set; }

AutoTurnOver.Models/dc_base_stock.cs

@@ -165,6 +165,7 @@ namespace AutoTurnOver.Models
 
     public class dc_base_stock_dto : dc_base_stock
     {
+        public string brand { get; set; }
         public decimal? moq { get; set; }
         /// <summary>
         /// 昨日销量

AutoTurnOver.Services/DailyServices.cs

@@ -102,7 +102,7 @@ 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)
                     {
@@ -175,6 +175,7 @@ namespace AutoTurnOver.Services
 
                         row["停售状态"] = itemData.sku_status_str;
                         row["moq"] = itemData.moq;
+                        row["品牌"] = itemData.brand;
                         table.Rows.Add(row);
                     }
 

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -301,7 +301,7 @@ namespace AutoTurnOver.Services
                 "实际库存", "安全库存", "周转天数", "供应商交期", "质检入库天数", "调拨头程天数", "预测是否断货", "缺货数量","监控状态","供应商","采购员","交期异常",
                 "过去7天日均","过去14天日均","过去30天日均","重量","单价","实时库存","ebay最近7天日均销量","ebay最近14天日均销量","ebay最近30天日均销量"
                 ,"速卖通最近7天日均销量","速卖通最近14天日均销量","速卖通最近30天日均销量"
-                ,"已发货库存","开发时间","是否侵权","停止监控时间","标签","停售","最近7天+预测销量","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量"
+                ,"已发货库存","开发时间","是否侵权","停止监控时间","标签","停售","最近7天+预测销量","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量","品牌"
             };
                 foreach (var item in cols)
                 {
@@ -361,6 +361,7 @@ namespace AutoTurnOver.Services
                     row["标签"] = itemData.sku_label;
                     row["停售"] = itemData.sku_status_str;
                     row["最近7天+预测销量"] = itemData.sales_details==null?"": itemData.sales_details.Replace("[","").Replace("]","");
+                    row["品牌"] = itemData.brand;
                     table.Rows.Add(row);
                 }
 

AutoTurnOver/Controllers/ReportsController.cs

@@ -303,7 +303,7 @@ namespace AutoTurnOver.Controllers
             DataTable table = new DataTable();
             string[] cols = new string[] { "缺货统计时间", "平台订单号", "平台类型", "百伦订单号", "付款交易号", "站点", "付款时间", "销售账号","国家","sku","订单所有itemid",
                 "产品名称", "订单sku销量", "发货数量","发货仓库编码","发货仓库", "是否缺货", "仓库总缺货", "国内仓总缺货", "其他有库存仓库", "其他仓库库存数","国内仓是否缺货","采购员",
-                 "平台物流方式", "发货物流方式", "sku监控状态", "销售状态", "总在途库存数", "最先到货采购单","最快到货时间","采购单供应商","采购单阿里巴巴单号","采购单物流单号"
+                 "平台物流方式", "发货物流方式", "sku监控状态", "销售状态", "总在途库存数", "最先到货采购单","最快到货时间","采购单供应商","采购单阿里巴巴单号","采购单物流单号","品牌"
             };
             foreach (var item in cols)
             {
@@ -347,6 +347,7 @@ namespace AutoTurnOver.Controllers
                 row["采购单供应商"] = itemData.min_buy.supplier_name;
                 row["采购单阿里巴巴单号"] = itemData.min_buy.alibaba_order_id;
                 row["采购单物流单号"] = itemData.min_buy.logistics_order_id;
+                row["品牌"] = itemData.brand;
 
                 table.Rows.Add(row);
             }