新增发货地筛选

AutoTurnOver.DB/report.cs

@@ -1712,7 +1712,8 @@ truncate table dc_auto_stock_monitor_temp;   ", commandTimeout: 0);
         }
         public static List<bailun_sku_website_sales_dto> GetSkuWebsiteSales(bailun_sku_website_sales_search_dto search_data)
         {
-            var sql = @" select t1.*,t2.label from dc_base_oms_sku_7 as t1 left join dc_auto_config_sku_label as t2 on t1.bailun_sku = t2.bailun_sku where 1=1 ";
+            var sql = @" select t1.*,t2.label from dc_base_oms_sku_7 as t1 left join dc_auto_config_sku_label as t2 on t1.bailun_sku = t2.bailun_sku 
+left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code where 1=1 ";
             DynamicParameters parameters = new DynamicParameters();
             if (search_data != null)
             {
@@ -1721,6 +1722,26 @@ truncate table dc_auto_stock_monitor_temp;   ", commandTimeout: 0);
                     sql += " and t1.platform_type = @platform_type ";
                     parameters.Add("platform_type",search_data.platform_type);
                 }
+                if (!string.IsNullOrWhiteSpace(search_data.warehousetype))
+                {
+                    if (search_data.warehousetype == "中国")
+                    {
+                        sql += " and t2.hq_type=@warehousetype ";
+                        parameters.Add("warehousetype", "国内仓");
+                    }
+                    else
+                    {
+                        if ("amazon".Equals(search_data.platform_type, StringComparison.OrdinalIgnoreCase))
+                        {
+                            sql += " and t2.hq_type in ('fba仓') ";
+                        }
+                        else
+                        {
+                            sql += " and t2.hq_type not in ('国内仓') ";
+                        }
+                    }
+                   
+                }
             }
             var oms_sku_list = _connection.Query<dc_base_oms_sku_label>(sql, parameters);
 

AutoTurnOver.Models/Report/bailun_sku_website_sales_dto.cs

@@ -11,7 +11,8 @@ namespace AutoTurnOver.Models.Report
         /// </summary>
         public bool? has_sum { get; set; }
         public string platform_type { get; set; }
-        public string warehouse_type { get; set; }
+        public string warehousetype { get; set; }
+
     }
 
     public class bailun_sku_website_sales_detailed_search_dto