diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs index a5c9966..aadbf91 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs @@ -74,7 +74,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports list.Add(new Tuple("AccountCustomer_Name", "结账客户")); list.Add(new Tuple("Customer_Name", "购货客户")); list.Add(new Tuple("Customer_DeliveryPhone", "联系方式")); - list.Add(new Tuple("CreateTime", "订货时间")); + list.Add(new Tuple("SaleForecastCreateTime", "订货时间")); list.Add(new Tuple("CheckTime", "验收审核时间")); list.Add(new Tuple("BillType", "业务类型")); list.Add(new Tuple("Department_Name", "部门")); @@ -336,12 +336,14 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); layout.Add("DeliveryTime", new SimpleLabel("预报提货时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinDeliveryTime", "MaxDeliveryTime")); layout["DeliveryTime"].NotAutoAddToContainer = true; - layout.Add("OrderLoadTime", new SimpleLabel("订单发货时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinOrderLoadTime", "MaxOrderLoadTime")); + layout.Add("OrderLoadTime", new SimpleLabel("订单提货时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinOrderLoadTime", "MaxOrderLoadTime")); layout["OrderLoadTime"].NotAutoAddToContainer = true; - layout.Add("OutCheckTime", new SimpleLabel("出库审核时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinOutCheckTime", "MaxOutCheckTime")); + layout.Add("OutCheckTime", new SimpleLabel("出库时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinOutCheckTime", "MaxOutCheckTime")); layout["OutCheckTime"].NotAutoAddToContainer = true; - layout.Add("AcceptCheckTime", new SimpleLabel("验收审核时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinAcceptCheckTime", "MaxAcceptCheckTime")); + layout.Add("AcceptCheckTime", new SimpleLabel("验收时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinAcceptCheckTime", "MaxAcceptCheckTime")); layout["AcceptCheckTime"].NotAutoAddToContainer = true; + layout.Add("SaleForecastCreateTime", new SimpleLabel("订货时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinSaleForecastCreateTime", "MaxSaleForecastCreateTime")); + layout["SaleForecastCreateTime"].NotAutoAddToContainer = true; var config = layout.CreateDefaultConfig(4); config.Expand = false; config.Add("Code"); @@ -622,6 +624,11 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); dom.Columns.Add(DQSelectColumn.Create(priceExp.ECastType?>(), item.Text)); ColumnNames.Add(item.Text); break; + case "SaleForecastCreateTime": + dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(saleForecast, "CreateTime"), item.Text)); + dom.GroupBy.Expressions.Add(DQExpression.Field(saleForecast, "CreateTime")); + ColumnNames.Add(item.Text); + break; } } @@ -683,6 +690,15 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); if (maxDeliveryTime.HasValue) { dom.Where.Conditions.Add(DQCondition.LessThanOrEqual(saleForecast, "DeliveryTime", maxDeliveryTime)); } + var minSaleForecastCreateTime = mQueryContainer.GetControl("MinSaleForecastCreateTime").Value; + var maxSaleForecastCreateTime = mQueryContainer.GetControl("MaxSaleForecastCreateTime").Value; + if (minSaleForecastCreateTime.HasValue) { + dom.Where.Conditions.Add(DQCondition.GreaterThanOrEqual(saleForecast, "CreateTime", minSaleForecastCreateTime)); + } + if (maxSaleForecastCreateTime.HasValue) { + dom.Where.Conditions.Add(DQCondition.LessThanOrEqual(saleForecast, "CreateTime", maxSaleForecastCreateTime)); + } + var minOrderLoadTime = mQueryContainer.GetControl("MinOrderLoadTime").Value; var maxOrderLoadTime = mQueryContainer.GetControl("MaxOrderLoadTime").Value; if (minOrderLoadTime.HasValue) {