Merge branch 'master' of bwpgit:BWPB3/B3YunKen

BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs

@@ -5,6 +5,7 @@ using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
 using BWP.B3Frameworks;
+using BWP.B3Frameworks.BO;
 using BWP.B3Frameworks.BO.NamedValueTemplate;
 using BWP.B3Frameworks.Utils;
 using BWP.B3Sale.BL;
@@ -382,9 +383,10 @@ namespace BWP.Web.Pages.B3YunKen {
       var query = _queryContainer.Build();
       var aready = new JoinAlias(typeof(AreadyTo));
       var bill = query.From.RootSource.Alias;
+      var acc = new JoinAlias(typeof(AccountingUnit));
       query.RegisterQueryTable(typeof(AreadyTo), new string[] { "ID", "AlreadyAcceptUnitNum" }, AreadyTo.Get());
       query.From.AddJoin(JoinType.Left, new DQDmoSource(aready), DQCondition.EQ(bill, "ID", aready, "ID"));
-
+      query.From.AddJoin(JoinType.Left, new DQDmoSource(acc), DQCondition.EQ(bill, "AccountingUnit_ID", acc, "ID"));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Field(aready, "AlreadyAcceptUnitNum"), "已验收数量"));
 
       if (_hideFinishedBill.Checked) {
@@ -400,6 +402,7 @@ namespace BWP.Web.Pages.B3YunKen {
       query.Columns.Add(DQSelectColumn.Field("IsSplitCreatedCustomerAccept", bill));
       query.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.已审核));
       query.Where.Conditions.Add(DQCondition.EQ("Domain_ID", DomainContext.Current.ID));
+      OrganizationUtil.AddOrganizationLimit(query, typeof(AccountingUnit), acc);
       return query;
     }
     protected override void OnPreRender(EventArgs e)

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

@@ -90,6 +90,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports
             list.Add(new Tuple<string, string>("NetPrice", "去包装净价"));
             list.Add(new Tuple<string, string>("ToFreightNetPrice", "去运费单价"));
             list.Add(new Tuple<string, string>("PolicyPrice", "政策价格"));
+            list.Add(new Tuple<string, string>("CustomerDealer_Name", "经销商"));
+          
             var section = mPageLayoutManager.AddSection("显示字段", "显示字段");
             section.ApplyLayout(list, mPageLayoutManager);
             foreach (var item in list)
@@ -155,10 +157,14 @@ B3SaleDataSources.结账客户), s => long.Parse(s)), "AccountCustomer_ID"));
 
           layout.Add("BrandItem_ID", new SimpleLabel("品牌项"),mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(_brandItem = QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["Car_ID"], B3UnitedInfosConsts.DataSources.品牌项), s => long.Parse(s)), "BrandItem_ID"));
             layout["BrandItem_ID"].NotAutoAddToContainer = true;
+            layout.Add("CustomerDealer_ID", mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["CustomerDealer_ID"],
+      B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
+            layout["CustomerDealer_ID"].NotAutoAddToContainer = true;
             var config = layout.CreateDefaultConfig(2);
             config.Expand = false;
-            //config.Add("LoadTime");
-            //config.Add("OrderDate");
+            config.Add("LoadTime");
+            config.Add("OrderDate");
+            config.Add("ArriveTime");
             //config.Add("AccountingUnit_ID");
             //config.Add("Goods_ID");
             //config.Add("GoodsPropertyCatalog_ID");
@@ -267,6 +273,7 @@ B3SaleDataSources.结账客户), s => long.Parse(s)), "AccountCustomer_ID"));
                   case "Driver_Telephone":
                   case "HandcarNumber":
                   case "Store_Name":
+                  case "CustomerDealer_Name":
                     dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(main, field), item.Text));
                     dom.GroupBy.Expressions.Add(DQExpression.Field(main, field));
                     break;

BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml

@@ -27,6 +27,14 @@
         <Field name="OrderDate"/>
         <QBE paramName="MaxOrderDate"/>
       </LessThanOrEqual>
+      <GreaterThanOrEqual>
+        <Field name="ArriveTime"/>
+        <QBE paramName="MinArriveTime" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="ArriveTime"/>
+        <QBE paramName="MaxArriveTime"/>
+      </LessThanOrEqual>
       <QBEIn>
         <Field name="AccountingUnit_ID"/>
         <QBE paramName="AccountingUnit_ID"/>
@@ -95,6 +103,10 @@
         <Field name="FreightPayment"/>
         <QBE paramName="FreightPayment"/>
       </EQ>
+      <QBEIn>
+        <Field name="CustomerDealer_ID"/>
+        <QBE paramName="CustomerDealer_ID"/>
+      </QBEIn>
     </And>
   </Where>
 </Select>