From 80643908b72778f9b11953f071a31584773536f7 Mon Sep 17 00:00:00 2001 From: wugang <425674808@qq.com> Date: Tue, 27 Mar 2018 14:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=A0=E5=80=92=E6=97=A5=E6=9C=9F=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs index fb9b8ee..9d9e1b5 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.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")))))); + query.From.AddJoin(JoinType.Left, new DQDmoSource(inStoreData), DQCondition.And(DQCondition.EQ(finishData, "Goods_ID", inStoreData, "Goods_ID"), DQExpression.Snippet("datediff(day,inData.Date,finiData.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"));