采购建议新增源仓库字段

AutoTurnOver.DB/purchase_advise.cs

@@ -621,10 +621,9 @@ where 1=1 ";
                 {
                     sql = @"
 select 
-t1.*,(case when t2.hq_type='fba仓' then bailun_account else t2.warehouse_name end) as 'warehouse_name',t3.sku_title_cn as 'sku_name',t4.create_time,t3.buyer_name,
+t1.*,(case when t2.hq_type='fba仓' then t2.bailun_account else t2.warehouse_name end) as 'warehouse_name',t3.sku_title_cn as 'sku_name',t4.create_time,t3.buyer_name,
 (t5.quantity_safe_inventory) as 'quantity_safe_inventory', -- 安全库存 
 (t5.daily_weighted_sales) as 'daily_weighted_sales', -- 日均加权 
-
 (t7.quantity_out_stock) as 'realtime_quantity_out_stock', -- 实时缺货 
 (t5.quantity_transfer) as 'quantity_transfer', -- 调拨在途 
 (t5.quantity_purchase) as 'quantity_purchase', -- 采购在途 
@@ -632,9 +631,11 @@ t1.*,(case when t2.hq_type='fba仓' then bailun_account else t2.warehouse_name e
 t3.suppliers_link,
 (t3.unit_price * (case when t1.quantity_actual>0 then t1.quantity_actual else t1.quantity_final_advise end ) ) as 'quantity_final_advise_price', -- 采购金额
 t3.suppliers_name,
+(case when t2_s.hq_type='fba仓' then t2_s.bailun_account else t2_s.warehouse_name end) as 'source_warehouse_code_name',
 (t1.history_fourteenday_sales - t5.forecast_fourteenday_sales) as 'sudden_increase' -- 突增关注
 from dc_auto_purchase_advise_detailed as t1 
 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+left join dc_base_warehouse as t2_s on t1.source_warehouse_code = t2_s.warehouse_code
 left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku
 left join dc_auto_purchase_advise as t4 on t1.main_id = t4.id
 left join dc_auto_turnover as t5 on t1.warehouse_code = t5.warehouse_code and t1.bailun_sku = t5.bailun_sku 

AutoTurnOver.Models/dc_auto_purchase_advise.cs

@@ -189,6 +189,19 @@ namespace AutoTurnOver.Models
 
     public class dc_auto_purchase_advise_detailed_dto : dc_auto_purchase_advise_detailed
     {
+        public string source_warehouse_code_name { get; set; }
+        public string source_warehouse_code_name_str
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(source_warehouse_code_name))
+                    return warehouse_name;
+                else
+                {
+                    return source_warehouse_code_name;
+                }
+            }
+        }
         public string warehouse_name { get; set; }
 
         public string sku_name { get; set; }

AutoTurnOver/Controllers/PurchaseAdviseController.cs

@@ -175,7 +175,7 @@ namespace AutoTurnOver.Controllers
             var list = PurchaseAdviseServices.DetailList(m, 0, int.MaxValue, ref total);
 
             DataTable table = new DataTable();
-            string[] cols = new string[] { "初始建议数", "系统建议数", "采购数量", "是否已推送","jit备货类型", "时间", "sku", "产品名称", "产品14日日均", "仓库编码","仓库名称",
+            string[] cols = new string[] { "初始建议数", "系统建议数", "采购数量", "是否已推送","jit备货类型", "时间", "sku", "产品名称", "产品14日日均", "仓库编码","仓库名称","源仓库",
                  "内部商品编码", "商品建议采购", "商品14日日均", "商品moq", "日均加权销量","安全库存", "缺货","实时缺货", "调拨在途", "采购在途", "库存数",
                  "采购金额", "供应链长度", "供应商名称", "采购类型","采购员","突增关注"
             };
@@ -187,7 +187,7 @@ namespace AutoTurnOver.Controllers
             foreach (var itemData in list)
             {
                 DataRow row = table.NewRow();
-
+                row["源仓库"] = itemData.source_warehouse_code_name_str;
                 row["初始建议数"] = itemData.quantity_init_advise;
                 row["系统建议数"] = itemData.quantity_final_advise;
                 row["采购数量"] = itemData.quantity_actual;