改为取经销商的销售地区

BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs

@@ -379,7 +379,8 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
       var salzone = new JoinAlias("zone",typeof(SaleZone)); 
        var goodsProperty = new JoinAlias(typeof(GoodsProperty));
        var customerCatalo = new JoinAlias(typeof(SaleCustomerCatalog));
-
+      var customer2 = new JoinAlias("cus2",typeof(Customer));
+      
       //var salzone = JoinAlias.Create("_9");
       //var cus = new JoinAlias(typeof(Customer));
 
@@ -396,6 +397,7 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
       DQCondition.EQ(goods, "ID", detail, "SaleGoods_ID"));
 
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(customer), DQCondition.EQ(main, "Customer_ID", customer, "ID"));
+      dom.From.AddJoin(JoinType.Left, new DQDmoSource(customer2), DQCondition.EQ(main, "CustomerDealer_ID", customer2, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(salzone), DQCondition.EQ(customer, "SaleZone_ID", salzone, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", goods, "GoodsProperty_ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(catalog), DQCondition.EQ(catalog, "ID", goodsProperty, "GoodsPropertyCatalog_ID"));
@@ -450,10 +452,13 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
           case "Customer_Name":
           case "CheckTime":
           case "BillType":
-          case "CustomerSaleZone_Name":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(main, field), item.Text));
             dom.GroupBy.Expressions.Add(DQExpression.Field(main, field));
             break;
+          case "CustomerSaleZone_Name":
+            dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(customer2, "SaleZone_Name"), item.Text));
+            dom.GroupBy.Expressions.Add(DQExpression.Field(customer2, "SaleZone_Name"));
+            break;
           case "Driver_Name":
           case "Driver_Telephone":
           case "HandcarNumber":