From e6ec6b74a98d9662c02b7518a77014f8ecd63066 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Mon, 9 Apr 2018 17:26:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E6=B8=85=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=20=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../B3QingDaoWanFu/Reports/PayInfoExport.cs   | 42 +++++++++++++++++--
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs
index cccc5ce..2302937 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs
@@ -26,6 +26,21 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       get { return "付款清单导出"; }
     }
 
+    protected override void InitQueryPanel(WebControls.QueryPanel queryPanel)
+    {
+      base.InitQueryPanel(queryPanel);
+      queryPanel.ConditonPanel.EAdd(CreateExportTypePanel());
+    }
+
+    DFBoolComboBox payTarget;
+    private HLayoutPanel CreateExportTypePanel()
+    {
+      var panel = new HLayoutPanel();
+      panel.Add(new SimpleLabel("付款对象"));
+      payTarget = panel.Add(new DFBoolComboBox() { TrueDisplayValue = "供应商", FalseDisplayValue = "养殖户" });
+      return panel;
+    }
+
     DFChoiceBox purchaseType;
     protected override void AddQueryControls(VLayoutPanel vPanel)
     {
@@ -55,10 +70,29 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       var t = string.Format(SubTitle, GetMinDate());
       var query = base.GetQueryDom();
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet<string>("ROW_NUMBER() OVER(order by [_bill].[ID])"), t + "序号"));
-      query.Columns.Add(DQSelectColumn.Field("Supplier_BankAccount", t + "卡号"));
-      query.Columns.Add(DQSelectColumn.Field("Supplier_Name", t + "姓名"));
-      query.Columns.Add(DQSelectColumn.Field("Money", t + "金额"));
-      SumColumnNames.Add("Money");
+      if (!payTarget.Value.Value)
+      {
+        var root = query.From.RootSource.Alias;
+        var detail = new JoinAlias(typeof(Pay_Detail));
+        var rel = new JoinAlias(typeof(Pay_Advance_Relate));
+        var adv = new JoinAlias(typeof(Pay_AdvanceDetail));
+        query.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(root, "ID", detail, "Pay_ID"));
+        query.From.AddJoin(JoinType.Left, new DQDmoSource(rel), DQCondition.EQ(detail, "ID", rel, "Pay_Detail_ID"));
+        query.From.AddJoin(JoinType.Left, new DQDmoSource(adv), DQCondition.And(DQCondition.EQ(root, "ID", adv, "Pay_ID"), DQCondition.EQ(rel, "Advance_ID", adv, "AdvancePay_ID")));
+        query.Columns.Add(DQSelectColumn.Field("ID", root, t + "付款单号"));
+        query.Columns.Add(DQSelectColumn.Field("Farmer_BankAccount", adv, t + "卡号"));
+        query.Columns.Add(DQSelectColumn.Field("Farmer_Name", adv, t + "姓名"));
+        query.Columns.Add(DQSelectColumn.Field("AdvancePay_Money", adv, t + "金额"));
+        SumColumnNames.Add("AdvancePay_Money");
+        query.Where.Conditions.Add(DQCondition.IsNotNull(DQExpression.Field(adv, "ID")));
+      }
+      else
+      {
+        query.Columns.Add(DQSelectColumn.Field("Supplier_BankAccount", t + "卡号"));
+        query.Columns.Add(DQSelectColumn.Field("Supplier_Name", t + "姓名"));
+        query.Columns.Add(DQSelectColumn.Field("Money", t + "金额"));
+        SumColumnNames.Add("Money");
+      }
       query.Columns.Add(DQSelectColumn.Field("Remark", t + "备注"));
       if (!purchaseType.IsEmpty)
         DetailTemp.AddPurchaseTypeCondition(query, long.Parse(purchaseType.Value));