From 67ecbe012c238e0d8dd2ed356a25b0a6cda47169 Mon Sep 17 00:00:00 2001 From: wugang <425674808@qq.com> Date: Fri, 9 Mar 2018 15:28:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9F=A5=E5=AE=A2=E6=88=B7=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=8D=95=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=98=AF?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/B3YunKen/Reports/EmployeeExamineReport.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.cs index 1a7ebaf..22f150d 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.cs @@ -50,7 +50,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports protected override void AddQueryControls(VLayoutPanel vPanel) { var layout = new LayoutManager("Main", mDFInfo, mQueryContainer); - layout.Add("LoadTime", new SimpleLabel("到货时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinLoadTime", "MaxLoadTime")); + layout.Add("LoadTime", new SimpleLabel("发货时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinLoadTime", "MaxLoadTime")); layout["LoadTime"].NotAutoAddToContainer = true; layout.Add("AccountingUnit_ID", new SimpleLabel("会计单位"), QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["AccountingUnit_ID"], mQueryContainer, "AccountingUnit_ID", B3FrameworksConsts.DataSources.授权会计单位全部)); layout["AccountingUnit_ID"].NotAutoAddToContainer = true; @@ -227,6 +227,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports query.RegisterQueryTable(typeof(GatheringTimeData), new string[] { "GatheringTime", "BillID" }, GetGatheringTime()); query.From.AddJoin(JoinType.Left, new DQDmoSource(gatheringTimeData), DQCondition.EQ(main, "ID", gatheringTimeData, "BillID")); query.From.AddJoin(JoinType.Left, new DQDmoSource(cus), DQCondition.EQ(main, "Customer_ID", cus, "ID")); + query.Where.Conditions.Add(DQCondition.EQ("BillType",DmoTypeIDAttribute.GetID(typeof(SaleOutStore)))); //query.Columns.Add(DQSelectColumn.Field("Money",main)); //query.Columns.Add(DQSelectColumn.Field("LoadTime", main)); //query.GroupBy.Expressions.Add(DQExpression.Field(main,"LoadTime"));