fix

AutoTurnOver.DB/report_invest_return_dao.cs

@@ -166,7 +166,7 @@ namespace AutoTurnOver.DB
                 var warehouseData = _connection.QueryFirstOrDefault<dc_base_warehouse>(" select * from dc_base_warehouse where warehouse_code=@warehouse_code  ", new
                 {
                     warehouse_code = stockItem.warehouse_code
-                });
+                })??new dc_base_warehouse { warehouse_code= stockItem.warehouse_code, warehouse_name  = "-",hq_type = ""};
                 // 查询在途数据
                 var stock_transit = _connection.QueryFirstOrDefault<dc_mid_transit>(" select * from dc_mid_transit where warehouse_code=@warehouse_code and bailun_sku=@bailun_sku ", new
                 {
@@ -188,6 +188,7 @@ namespace AutoTurnOver.DB
                     stock = stockItem.usable_stock + stock_transit.quantity_purchase + stock_transit.quantity_transfer,
                     project = sku.project,
                     sku_name = baseSku.sku_title_cn,
+                    warehouse_type = warehouseData.hq_type,
                     quantity_transfer = stock_transit.quantity_transfer,
                     quantity_purchase = stock_transit.quantity_purchase,
                     create_user = "system",

AutoTurnOver.Models/dc_report_invest_return_analysis.cs

@@ -101,6 +101,7 @@ namespace AutoTurnOver.Models
         /// 最近30天的广告费（usd）
         /// </summary>
         public decimal adfee_day_30 { get; set; }
+        public string warehouse_type { get; set; }
 
         /// <summary>
         /// 最近30天的平台费

AutoTurnOver/Controllers/ReportInvestReturnController.cs

@@ -43,7 +43,7 @@ namespace AutoTurnOver.Controllers
             string[] cols = new string[] {
                 "sku",  "所属项目", "标题",  "采购单价 ￥", "仓库编码", "仓库名称", "总库存（在库+在途）", "总金额 （在库+在途）", "日均销量", "过去30天销量", "过去7天销量",  "出单天数 (总)", "出单天数 (过去30天)", "首次出单日期", "最后出单日期", 
                 "30天利润 CNY",   "可售天数",   "采购在途数量",  "采购在途金额",   "头程在途",    "头程在途金额",  "在库库存",   "在库金额 CNY",   "预估运费 CNY",  "单位头程费", "预测30天销量", "预测30天销售额 CNY",
-                "最近30天的平均销售单价  CNY",  "广告费率",  "最近30天的销售额 USD",  "最近30天的平台费 USD", "平台费率", "最近30天的退款金额 USD", "退款金额占比",  "最后更新时间", "库存管理得分", 
+                "最近30天的平均销售单价  CNY",  "广告费率",  "最近30天广告费 USD", "最近30天的销售额 USD",  "最近30天的平台费 USD", "平台费率", "最近30天的退款金额 USD", "退款金额占比",  "最后更新时间", "库存管理得分", 
             };
             foreach (var item in cols)
             {
@@ -56,6 +56,7 @@ namespace AutoTurnOver.Controllers
 
                 row["sku"] = itemData.sku;
                 row["所属项目"] = itemData.project;
+                row["最近30天广告费 USD"] = itemData.adfee_day_30;
                 row["标题"] = itemData.sku_name;
                 row["采购单价 ￥"] = itemData.price;
                 row["仓库编码"] = itemData.warehouse_code;

ResetOutofstock/ResetOutofstockBackgrounService.cs

@@ -603,8 +603,8 @@ namespace ResetOutofstock
                    }
                    catch (Exception ex)
                    {
-                       Console.WriteLine(" 分摊广告费:" + ex.Message);
-                       Console.WriteLine(" 分摊广告费 :" + ex.StackTrace);
+                       Console.WriteLine(" 计算库存分:" + ex.Message);
+                       Console.WriteLine(" 计算库存分 :" + ex.StackTrace);
                    }