将验收金额

BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs

@@ -79,7 +79,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       list.Add(new Tuple<string, string>("CreditPolicy_Name", "信用政策"));
       list.Add(new Tuple<string, string>("OutBillID", "出库单号"));
       list.Add(new Tuple<string, string>("FreightMoney", "运费"));
-      list.Add(new Tuple<string, string>("Money", "验收金额"));
+      list.Add(new Tuple<string, string>("AcceptMoney", "验收金额"));
       list.Add(new Tuple<string, string>("Store_Name", "仓库"));
       list.Add(new Tuple<string, string>("DeliverAddress", "送货地址"));
       list.Add(new Tuple<string, string>("TakeGoods_Type", "配送方式"));
@@ -350,7 +350,7 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(freightMoney).ECastType<Money<金额>?>(), 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<Money<金额>?>(), item.Text));