From 54b6bf54cb212ce385fdecd34aa4c4e722bfc5a5 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Sat, 28 Apr 2018 10:53:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=AD=E7=BB=BC=E5=90=88=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4=E5=92=8C=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9A=E6=88=90=E6=9C=AC=E9=87=91=E9=A2=9D=EF=BC=8C=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E5=8D=95=E4=BB=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/ComprehensiveReport.cs | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs index bce17f6..29833e5 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs +++ b/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(); 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?>(), 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?>(), field.Text)); + + sumColumn.Add(field.Text); + break; + case "盈亏": query.Columns.Add(DQSelectColumn.Create(盈亏, "盈亏"));