From 0d09f9136be5f50f8f1c2a2f6bec36000ede878d Mon Sep 17 00:00:00 2001 From: wugang <425674808@qq.com> Date: Tue, 27 Mar 2018 13:58:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=BD=E4=B8=8D=E5=A1=AB?= =?UTF-8?q?=E5=AD=98=E8=B4=A7=E6=89=B9=E5=8F=B7=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../B3YunKen/Reports/ProduceFinishDiffReport.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs index 62482b3..fb9b8ee 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs @@ -127,7 +127,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports var query = new DQueryDom(finishData); query.RegisterQueryTable(typeof(FinishData), new List { "Date", "Goods_ID", "BrandItem_ID", "SumNumber", "SumSecondNumber", "ProductionUnit_Name", "Employee_Name", "GoodsBatch_ID" }, dom); query.RegisterQueryTable(typeof(InStoreData), new List { "Date", "Goods_ID", "BrandItem_ID", "SumNumber", "SumSecondNumber", "GoodsBatch_ID" }, GetInStoreQuery()); - query.From.AddJoin(JoinType.Left, new DQDmoSource(inStoreData), DQCondition.And(DQCondition.EQ(finishData, "Goods_ID", inStoreData, "Goods_ID"), DQExpression.Snippet("datediff(day,finiData.Date,inData.Date) = 1"), DQCondition.EQ(finishData, "BrandItem_ID", inStoreData, "BrandItem_ID"), DQCondition.EQ(finishData, "GoodsBatch_ID", inStoreData, "GoodsBatch_ID"))); + query.From.AddJoin(JoinType.Left, new DQDmoSource(inStoreData), DQCondition.And(DQCondition.EQ(finishData, "Goods_ID", inStoreData, "Goods_ID"), DQExpression.Snippet("datediff(day,finiData.Date,inData.Date) = 1"), DQCondition.EQ(finishData, "BrandItem_ID", inStoreData, "BrandItem_ID"), DQCondition.Or(DQCondition.EQ(finishData, "GoodsBatch_ID", inStoreData, "GoodsBatch_ID"),DQCondition.And(DQCondition.IsNull(DQExpression.Field(finishData,"GoodsBatch_ID")),DQCondition.IsNull(DQExpression.Field(inStoreData,"GoodsBatch_ID")))))); var goods1 = new JoinAlias("goods", typeof(Goods)); query.From.AddJoin(JoinType.Left, new DQDmoSource(goods1), DQCondition.EQ(goods1, "ID", finishData, "Goods_ID")); @@ -250,7 +250,12 @@ namespace BWP.Web.Pages.B3YunKen.Reports if (!_productLine.IsEmpty) { query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(goods1, "ProductLine_ID"), _productLine.GetValues().Select(x => DQExpression.Value(x)).ToArray())); } - + var miniDate = mQueryContainer.GetControl("MinFinishDate"); + var maxDate = mQueryContainer.GetControl("MaxFinishDate"); + if(!miniDate.IsEmpty) + query.Where.Conditions.Add(DQCondition.GreaterThanOrEqual(finishData,"Date",miniDate.Value)); + if (!maxDate.IsEmpty) + query.Where.Conditions.Add(DQCondition.LessThanOrEqual(finishData, "Date", maxDate.Value)); return query; } @@ -345,9 +350,11 @@ namespace BWP.Web.Pages.B3YunKen.Reports layoutManager.Add("Goods_ID", new SimpleLabel("存货"), mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(_goods = QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["ID"], B3SaleDataSources.可销售存货), s => long.Parse(s)), "Goods_ID")); layoutManager["Goods_ID"].NotAutoAddToContainer = true; + layoutManager.Add("FinishDate", new SimpleLabel("完工时间"), QueryCreator.DateRange(mDFInfo.Fields["ID"], mQueryContainer, "MinFinishDate", "MaxFinishDate")); + layoutManager["FinishDate"].NotAutoAddToContainer = true; var config = new AutoLayoutConfig { Cols = 4 }; - config.Add("Date"); + config.Add("FinishDate"); config.Add("ProductionUnit_ID"); config.Add("GoodsProperty_ID"); config.Add("GoodsPropertyCatalog_ID");