From af6b3635408298cc1e5174e16610cc23cdbb7b5c Mon Sep 17 00:00:00 2001 From: wushukun <18860363876@163.com> Date: Thu, 8 Feb 2018 17:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=AA=8C=E6=94=B6=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs index 3d459ae..703a904 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs @@ -79,7 +79,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports list.Add(new Tuple("CreditPolicy_Name", "信用政策")); list.Add(new Tuple("OutBillID", "出库单号")); list.Add(new Tuple("FreightMoney", "运费")); - list.Add(new Tuple("Money", "验收金额")); + list.Add(new Tuple("AcceptMoney", "验收金额")); list.Add(new Tuple("Store_Name", "仓库")); list.Add(new Tuple("DeliverAddress", "送货地址")); list.Add(new Tuple("TakeGoods_Type", "配送方式")); @@ -350,7 +350,7 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(freightMoney).ECastType?>(), item.Text)); //SumColumnIndexs.Add(dom.Columns.Count - 1); break; - case "Money": + case "AcceptMoney": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, field)), item.Text)); SumColumnIndexs.Add(dom.Columns.Count - 1); break; @@ -368,9 +368,9 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); break; case "NetPrice": - var 购方netExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "Money"), 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, "Money"), DQExpression.IfNull(freightMoney, DQExpression.Value(0))).ESubtract(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")); @@ -389,7 +389,7 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); var 购方priceExp = DQExpression.Field(detail, "AcceptPrice"); - var 供方priceExp = DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "Money"), 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));