From 15f51373e833f014e14c68e86f3e1804f4a8e801 Mon Sep 17 00:00:00 2001 From: wushukun <18860363876@163.com> Date: Thu, 22 Feb 2018 11:13:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E5=8D=95=E4=BB=B7=E6=B5=8B=E5=8F=96=E5=80=BC=20=E8=AF=A6?= =?UTF-8?q?=E8=A7=81=E9=9C=80=E6=B1=82=E5=8D=95138727?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/ToFreightNetPriceReport2.cs | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs index 35544a7..0c875e3 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs @@ -368,15 +368,16 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); break; case "NetPrice": - var 购方netExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "AcceptMoney"), DQExpression.IfNull(包装费Exp, DQExpression.Value(0)))) , DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum")))); + //var 购方netExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "AcceptMoney"), DQExpression.IfNull(包装费Exp, DQExpression.Value(0)))) , DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum")))); - var 供方netExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "AcceptMoney"), DQExpression.IfNull(freightMoney, DQExpression.Value(0))).ESubtract(DQExpression.IfNull(包装费Exp, DQExpression.Value(0)))), DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum")))); - - var netExp = DQExpression.LogicCase(DQCondition.EQ(outStore, "FreightBear", 运费承担方.购方), 购方netExp, DQCondition.EQ(outStore, "FreightBear", 运费承担方.供方), 供方netExp, DQExpression.Value(null)); - dom.GroupBy.Expressions.Add(DQExpression.Field(outStore, "FreightBear")); + //var 供方netExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "AcceptMoney"), DQExpression.IfNull(freightMoney, DQExpression.Value(0))).ESubtract(DQExpression.IfNull(包装费Exp, DQExpression.Value(0)))), DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum")))); + //var netExp = DQExpression.LogicCase(DQCondition.EQ(outStore, "FreightBear", 运费承担方.购方), 购方netExp, DQCondition.EQ(outStore, "FreightBear", 运费承担方.供方), 供方netExp, DQExpression.Value(null)); + //dom.GroupBy.Expressions.Add(DQExpression.Field(outStore, "FreightBear")); + //dom.Columns.Add(DQSelectColumn.Create(netExp.ECastType?>(), item.Text)); + var netExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "AcceptMoney"), DQExpression.IfNull(DQExpression.LogicCase(DQCondition.EQ(outStore, "FreightBear", 运费承担方.购方), DQExpression.Value(0), freightMoney), DQExpression.Value(0))).ESubtract(DQExpression.IfNull(包装费Exp, DQExpression.Value(0)))), DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum")))); dom.Columns.Add(DQSelectColumn.Create(netExp.ECastType?>(), item.Text)); break; case "ToFreightNetPrice": @@ -387,14 +388,16 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); //｛去运费单价｝=（验收金额 - 运费费用）÷报价数量 //｛去包装净价｝=（验收金额 - 包装费用 - 运费）÷验收报价数量 - var 购方priceExp = DQExpression.Sum(DQExpression.Field(detail, "AcceptMoney")).ESafeDivide(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum"))) ; + //var 购方priceExp = DQExpression.Sum(DQExpression.Field(detail, "AcceptMoney")).ESafeDivide(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum"))) ; + + //var 供方priceExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "AcceptMoney"), DQExpression.IfNull(freightMoney, DQExpression.Value(0)))), DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum")))); - var 供方priceExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "AcceptMoney"), DQExpression.IfNull(freightMoney, DQExpression.Value(0)))), DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum")))); + //var priceExp = DQExpression.LogicCase(DQCondition.EQ(outStore, "FreightBear", 运费承担方.购方), 购方priceExp, DQCondition.EQ(outStore, "FreightBear", 运费承担方.供方), 供方priceExp, DQExpression.Value(null)); + //dom.Columns.Add(DQSelectColumn.Create(priceExp.ECastType?>(), item.Text)); + //dom.GroupBy.Expressions.Add(DQExpression.Field(outStore, "FreightBear")); - var priceExp = DQExpression.LogicCase(DQCondition.EQ(outStore, "FreightBear", 运费承担方.购方), 购方priceExp, DQCondition.EQ(outStore, "FreightBear", 运费承担方.供方), 供方priceExp, DQExpression.Value(null)); + var priceExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "AcceptMoney"), DQExpression.IfNull(DQExpression.LogicCase(DQCondition.EQ(outStore, "FreightBear", 运费承担方.购方), DQExpression.Value(0), freightMoney), DQExpression.Value(0)))), DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "AcceptNum")))); dom.Columns.Add(DQSelectColumn.Create(priceExp.ECastType?>(), item.Text)); - dom.GroupBy.Expressions.Add(DQExpression.Field(outStore, "FreightBear")); - break; } }