From 4b84f7242f8a38d330783621904903e883b075b7 Mon Sep 17 00:00:00 2001 From: wugang <425674808@qq.com> Date: Fri, 27 Apr 2018 16:42:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4=E5=8D=95No?= =?UTF-8?q?.45912?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/CustomerStopByTaskReport.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs index 519bd5f..dd72d4a 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs @@ -76,7 +76,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports _checkbox.Items.Add(new ListItem("销售地区", "SaleZone_Name")); _checkbox.Items.Add(new ListItem("销售人员", "Employee_Name")); _checkbox.Items.Add(new ListItem("信用政策", "PriceStrategy_Name")); - _checkbox.Items.Add(new ListItem("上次停用时间", "上次停用时间")); + _checkbox.Items.Add(new ListItem("上次停用时间", "StopedTime")); _checkbox.Items.Add(new ListItem("停用原因", "停用原因")); _checkbox.Items.Add(new ListItem("最后一次发货时间", "LastGoodsOutStoreDate")); @@ -118,6 +118,15 @@ namespace BWP.Web.Pages.B3YunKen.Reports return query; } + private static DQueryDom GetMaxLoadTime(JoinAlias bill) + { + var query = new DQueryDom(new JoinAlias(typeof(CustomerAccept))); + query.Columns.Add(DQSelectColumn.Max("LoadTime")); + query.Where.Conditions.Add(DQCondition.EQ(query.From.RootSource.Alias,"CustomerDealer_ID", bill,"ID")); + query.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.已审核)); + return query; + } + protected override DQueryDom GetQueryDom() { var query = base.GetQueryDom(); @@ -137,7 +146,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports case "销售人员": case "销售地区": case "信用政策": - case "最后一次发货时间": + case "上次停用时间": query.Columns.Add(DQSelectColumn.Create(DQExpression.Field(field.Value), field.Text)); // query.GroupBy.Expressions.Add(DQExpression.Field( "Zone_Name")); break; @@ -150,9 +159,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports case "移动电话": query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetLinkPhone(bill)), field.Text)); break; - - case "上次停用时间": - query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetLastStopTime(bill)), field.Text)); + case "最后一次发货时间": + query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetMaxLoadTime(bill)), field.Text)); break; case "经销商": var jxs = DQExpression.LogicCase(DQCondition.EQ("IsDealers", DQExpression.Value(true)),DQExpression.Field("Name"),DQExpression.SubQuery(GetJingXiaoShang(bill)));