From 317741b5288834f576d7191f3d522803c4cf2a8d Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 24 Apr 2018 08:13:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=94=B6=E8=B4=AD=E9=87=8D=E9=87=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs index 42157a1..82e4a76 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs @@ -53,18 +53,21 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports result.Data.SumRow["实付金额"] = billSum.Item1; if (ColumnNames.Contains("收购头数")) result.Data.SumRow["收购头数"] = billSum.Item2; + if (ColumnNames.Contains("收购重量")) + result.Data.SumRow["收购重量"] = billSum.Item3; } return result; } - Tuple< Money<金额>? ,int?>GetBillSum() + Tuple?, int?, Money?> GetBillSum() { var query = base.GetQueryDom(); var n = new DQueryDom(new JoinAlias(typeof(StatPay))); n.Where.Conditions.Add(DQCondition.And(query.Where.Conditions)); n.Columns.Add(DQSelectColumn.Sum("ActualMoney")); n.Columns.Add(DQSelectColumn.Sum("RealNumber")); - return n.EExecuteScalar?,int?>(); + n.Columns.Add(DQSelectColumn.Sum("RealWeight")); + return n.EExecuteScalar?, int?, Money?>(); } public override Forks.EnterpriseServices.DataForm.DFDataTable GetDFDataTable(TSingSoft.WebControls2.DFGrids.QuerySettings settings) @@ -77,6 +80,8 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports result.SumRow["实付金额"] = billSum.Item1; if (ColumnNames.Contains("收购头数")) result.SumRow["收购头数"] = billSum.Item2; + if (ColumnNames.Contains("收购重量")) + result.SumRow["收购重量"] = billSum.Item3; } return result; } @@ -119,6 +124,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports mDisplayHelper.AddOptionItem("结算日期", "_bill", "Date", false); mDisplayHelper.AddOptionItem("供应商", "_bill", "Supplier_Name", false); mDisplayHelper.AddOptionItem("收购头数", "_bill", "RealNumber", false); + mDisplayHelper.AddOptionItem("收购重量", "_bill", "RealWeight", false); mDisplayHelper.AddOptionItem("过磅单号", "_bill", "Weigh_ID", false); mDisplayHelper.AddOptionItem("过磅日期", () => DQExpression.Snippet("CAST([_weight].[WeighTime] AS DATE)").ECastType(), false); mDisplayHelper.AddOptionItem("实付金额", "_bill", "ActualMoney", false);