diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs index e603687..aac7b10 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs @@ -47,7 +47,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports DFChoiceBox _goods, _brandItem, _productLine, _goodsBatch; DFTextBox _saleout; DFNamedValueInput<运费承担方> freightBear; - // + DFDropDownList billTypeBox; + private readonly DFInfo mDFInfo = DFInfo.Get(typeof(CustomerAccept)); private readonly DFInfo _detailInfo = DFInfo.Get(typeof(CustomerAccept_Detail)); @@ -75,6 +76,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports list.Add(new Tuple("OrderDate", "订货时间")); list.Add(new Tuple("LoadTime", "发货时间")); list.Add(new Tuple("ArriveTime", "到货时间")); + list.Add(new Tuple("CheckTime", "审核时间")); + list.Add(new Tuple("BillType", "业务类型")); list.Add(new Tuple("Department_Name", "部门")); list.Add(new Tuple("CustomerSaleZone_Name", "地区")); list.Add(new Tuple("SaleKind_Name", "销售类型")); @@ -187,10 +190,19 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); layout.Add("FreightBear", new SimpleLabel("运费承担方"), freightBear = QueryCreator.DFNameValueInputEnableMultiSelection<运费承担方>(mDFInfo.Fields["ID"])); layout["SaleOutID"].NotAutoAddToContainer = true; layout["FreightBear"].NotAutoAddToContainer = true; + billTypeBox = new DFDropDownList() { Width = Unit.Pixel(160) }; + billTypeBox.Items.Add(""); + billTypeBox.Items.Add(new ListItem("销售出库", DmoTypeIDAttribute.GetID(typeof(SaleOutStore)).ToString())); + billTypeBox.Items.Add(new ListItem("退货入库", DmoTypeIDAttribute.GetID(typeof(ReturnInStore)).ToString())); + layout.Add("BillType", new SimpleLabel("业务类型"), billTypeBox); + layout["BillType"].NotAutoAddToContainer = true; + var config = layout.CreateDefaultConfig(4); config.Expand = false; config.Add("LoadTime"); config.Add("OrderDate"); + config.Add("CheckTime"); + config.Add("Code"); //config.Add("SaleOutID"); //config.Add("ArriveTime"); //config.Add("AccountingUnit_ID"); @@ -319,6 +331,8 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); case "Store_Name": case "CustomerDealer_Name": case "Customer_Name": + case "CheckTime": + case "BillType": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(main, field), item.Text)); dom.GroupBy.Expressions.Add(DQExpression.Field(main, field)); break; @@ -454,6 +468,9 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); { dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(outStore, "FreightBear"), freightBear.GetValues().Select(x=> DQExpression.Value(x)).ToArray())); } + if (billTypeBox.SelectedIndex > 0){ + dom.Where.Conditions.Add(DQCondition.EQ("BillType", billTypeBox.SelectedValue)); + } dom.Where.Conditions.Add(DQCondition.EQ(main, "BillState", 单据状态.已审核)); return dom; } diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.xml index f8b2c6b..a50a220 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.xml +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.xml @@ -11,6 +11,10 @@ + + + + @@ -27,6 +31,14 @@ + + + + + + + +