商品汇总，仓库维度，支持任意仓库类型

AutoTurnOver.DB/report.cs

@@ -2435,7 +2435,7 @@ left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code whe
                 tableName = "dc_base_oms_sku";
             }
             var sql = $@" select t1.*,t2.label,tdb.warehouse_name from {tableName} 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 tdb.hq_type='第三方仓库' ";
+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)
             {
@@ -2461,22 +2461,8 @@ left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code whe
                 }
                 if (!string.IsNullOrWhiteSpace(search_data.warehousetype))
                 {
-                    if (search_data.warehousetype == "国内仓")
-                    {
-                        sql += " and tdb.hq_type=@warehousetype ";
-                        parameters.Add("warehousetype", "国内仓");
-                    }
-                    else
-                    {
-                        if ("amazon".Equals(search_data.platform_type, StringComparison.OrdinalIgnoreCase))
-                        {
-                            sql += " and tdb.hq_type in ('fba仓') ";
-                        }
-                        else
-                        {
-                            sql += " and tdb.hq_type not in ('国内仓') ";
-                        }
-                    }
+                    sql += " and tdb.hq_type=@warehousetype ";
+                    parameters.Add("warehousetype", search_data.warehousetype);
                 }
                 if (search_data.warehousearea > 0)
                 {