收购综合报表调整和加字段：成本金额，成本单价。

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs

@@ -75,12 +75,13 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
         table.SumRow["皮肉重量"] = sum皮肉重量;
       }
       catch { }
-      SetCommonDivSumTable(table, "毛重单价", "应付金额", "到厂毛重");
-      SetCommonDivSumTable(table, "实付单价", "实付金额", "到厂毛重");
+      SetCommonDivSumTable(table, "核算单价", "核算金额", "到厂毛重");
+      SetCommonDivSumTable(table, "付款单价", "付款金额", "到厂毛重");
       SetCommonDivSumTable(table, "单头盈亏", "盈亏", "收购头数");
       SetCommonDivSumTable(table, "均重", "到厂毛重", "收购头数");
       SetCommonDivSumTable(table, "损耗比", "损耗", "原发毛重", true);
       SetCommonDivSumTable(table, "皮肉比", "皮肉重量", "到厂毛重", true);
+      SetCommonDivSumTable(table, "成本单价", "成本金额", "到厂毛重");
 
       Set占比(table);
 
@@ -269,10 +270,12 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       _checkbox.Items.Add(new ListItem("宰后扣款", "宰后扣款"));
       _checkbox.Items.Add(new ListItem("死猪扣款", "DeadPigRewardMoney"));
 
-      _checkbox.Items.Add(new ListItem("实付金额", "ActualMoney"));
-      _checkbox.Items.Add(new ListItem("应付金额", "Money"));
-      _checkbox.Items.Add(new ListItem("实付单价", "ActualPrice"));
-      _checkbox.Items.Add(new ListItem("毛重单价", "RawPrice"));
+      _checkbox.Items.Add(new ListItem("付款金额", "ActualMoney"));
+      _checkbox.Items.Add(new ListItem("核算金额", "Money"));
+      _checkbox.Items.Add(new ListItem("成本金额", "CostMoney"));
+      _checkbox.Items.Add(new ListItem("付款单价", "ActualPrice"));
+      _checkbox.Items.Add(new ListItem("核算单价", "RawPrice"));
+      _checkbox.Items.Add(new ListItem("成本单价", "CostPrice"));
 
       _checkbox.Items.Add(new ListItem("盈亏", "盈亏"));
       _checkbox.Items.Add(new ListItem("单头盈亏", "单头盈亏"));
@@ -367,7 +370,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       var 损耗 = DQExpression.Subtract(榜前重量, 收购重量);
       var 皮肉重量 = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 2), DQExpression.Field(unionAlias, "TotalWeight")));
       var 盈亏 = DQExpression.Subtract(DQExpression.Subtract(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "Money"))), DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "ActualMoney")))), DQExpression.Sum(DQExpression.Add(DQExpression.IfNull(DQExpression.Field(costRecord, "TransferFee"), DQExpression.Value(0)), DQExpression.IfNull(DQExpression.Field(costRecord, "JingJiFee"), DQExpression.Value(0)))));
-
+      var costMoney = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Add(DQExpression.Add(DQExpression.IfNull(DQExpression.Field(costRecord, "TransferFee"), DQExpression.Value(0)), DQExpression.IfNull(DQExpression.Field(costRecord, "JingJiFee"), DQExpression.Value(0))), DQExpression.IfNull(DQExpression.Field(unionAlias, "ActualMoney"), DQExpression.Value(0)))));
       var sumColumn = new List<string>();
 
       foreach (ListItem field in _checkbox.Items)
@@ -408,16 +411,28 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
             case "收购头数":
             case "原发毛重":
             case "到厂毛重":
-            case "实付金额":
-            case "应付金额":
-            case "毛重单价":
-            case "实付单价":
+            case "付款金额":
+            case "核算金额":
+            case "核算单价":
+            case "付款单价":
             case "宰前扣款":
             case "死猪扣款":
               query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, field.Value))), field.Text));
 
               sumColumn.Add(field.Text);
               break;
+            case "成本金额":
+              query.Columns.Add(DQSelectColumn.Create(costMoney.ECastType<Money<金额>?>(), field.Text));
+
+              sumColumn.Add(field.Text);
+              break;
+
+            case "成本单价":
+              query.Columns.Add(DQSelectColumn.Create(DQExpression.Divide(costMoney, DQExpression.NullIfZero(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "RealWeight"))))).ECastType<Money<二位小数>?>(), field.Text));
+
+              sumColumn.Add(field.Text);
+              break;
+
             case "盈亏":
               query.Columns.Add(DQSelectColumn.Create(盈亏, "盈亏"));