diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs index 703a904..35544a7 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs @@ -387,14 +387,14 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); //{去运费单价}=(验收金额 - 运费费用)÷报价数量 //{去包装净价}=(验收金额 - 包装费用 - 运费)÷验收报价数量 - var 购方priceExp = DQExpression.Field(detail, "AcceptPrice"); + 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.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")); - dom.GroupBy.Expressions.Add(购方priceExp); + break; } }