付款分析。

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs

@@ -46,25 +46,38 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
     public override Forks.EnterpriseServices.DataForm.PagedDFDataTable GetPagedDFDataTable(TSingSoft.WebControls2.DFGrids.QuerySettings settings)
     {
       var result = base.GetPagedDFDataTable(settings);
-      if (ColumnNames.Contains("实付金额"))
-        result.Data.SumRow["实付金额"] = GetTotalActualMoney();
+      var billSum = GetBillSum();
+      if (billSum != null)
+      {
+        if (ColumnNames.Contains("实付金额"))
+          result.Data.SumRow["实付金额"] = billSum.Item1;
+        if (ColumnNames.Contains("收购头数"))
+          result.Data.SumRow["收购头数"] = billSum.Item2;
+      }
       return result;
     }
 
-    Money<金额>? GetTotalActualMoney()
+    Tuple< Money<金额>? ,int?>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"));
-      return n.EExecuteScalar<Money<金额>?>();
+      n.Columns.Add(DQSelectColumn.Sum("RealNumber"));
+      return n.EExecuteScalar<Money<金额>?,int?>();
     }
 
     public override Forks.EnterpriseServices.DataForm.DFDataTable GetDFDataTable(TSingSoft.WebControls2.DFGrids.QuerySettings settings)
     {
       var result = base.GetDFDataTable(settings);
-      if (ColumnNames.Contains("实付金额"))
-        result.SumRow["实付金额"] = GetTotalActualMoney();
+      var billSum = GetBillSum();
+      if (billSum != null)
+      {
+        if (ColumnNames.Contains("实付金额"))
+          result.SumRow["实付金额"] = billSum.Item1;
+        if (ColumnNames.Contains("收购头数"))
+          result.SumRow["收购头数"] = billSum.Item2;
+      }
       return result;
     }
 
@@ -105,8 +118,9 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       mDisplayHelper.AddOptionItem("结算单号", "_bill", "ID", false);
       mDisplayHelper.AddOptionItem("结算日期", "_bill", "Date", false);
       mDisplayHelper.AddOptionItem("供应商", "_bill", "Supplier_Name", false);
+      mDisplayHelper.AddOptionItem("收购头数", "_bill", "RealNumber", false);
       mDisplayHelper.AddOptionItem("过磅单号", "_bill", "Weigh_ID", false);
-      mDisplayHelper.AddOptionItem("过磅日期", "_bill", "WeighTime", false);
+      mDisplayHelper.AddOptionItem("过磅日期", () => DQExpression.Snippet("CAST([_weight].[WeighTime] AS DATE)").ECastType<DateTime?>(), false);
       mDisplayHelper.AddOptionItem("实付金额", "_bill", "ActualMoney", false);
 
       mDisplayHelper.AddOptionItem("养殖户", "_detail", "Farmer_Name", false);
@@ -126,10 +140,13 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
     {
       var query = base.GetQueryDom();
       var root = query.From.RootSource.Alias;
+      var weight = new JoinAlias("_weight", typeof(WeighBill));
       var detail = new JoinAlias("_detail", typeof(Weigh_FarmerDetail));
+      query.From.AddJoin(JoinType.Left, new DQDmoSource(weight), DQCondition.EQ(root, "Weigh_ID", weight, "ID"));
       query.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(root, "Weigh_ID", detail, "Weigh_ID"));
-      mDisplayHelper.AddAlias("_bill", JoinAlias.Create("_bill"));
-      mDisplayHelper.AddAlias("_detail", JoinAlias.Create("_detail"));
+      mDisplayHelper.AddAlias("_bill", root);
+      mDisplayHelper.AddAlias("_weight", weight);
+      mDisplayHelper.AddAlias("_detail", detail);
 
       mDisplayHelper.AddSelectColumns(query, (name) => OptionIsSelected("选项", name), SumColumnNames, ColumnNames);
       query.Where.Conditions.Add(DQCondition.EQ(root, "Domain_ID", DomainContext.Current.ID));