From 43ab276e81c01ab9fc5541a07327bfcdaad8068b Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Thu, 19 Apr 2018 11:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.139586=20?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=87=E7=A6=8F=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8A=A5=E8=A1=A8=E3=80=90=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj  |   9 ++
 .../Overlays/StatPayList_Ext.cs               |  20 +++
 .../B3QingDaoWanFu/Reports/StatPayAnalyse.cs  | 138 ++++++++++++++++++
 .../B3QingDaoWanFu/Reports/StatPayAnalyse.xml |  53 +++++++
 B3QingDaoWanFu.Web/PluginClass.cs             |   1 +
 B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs   |   4 +-
 .../config/plugins/B3QingDaoWanFu.plugin      |   1 +
 7 files changed, 224 insertions(+), 2 deletions(-)
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayList_Ext.cs
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.xml

diff --git a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
index 4eb9c99..fc00557 100644
--- a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
+++ b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
@@ -164,6 +164,9 @@
     <Compile Include="Pages\B3QingDaoWanFu\Overlays\StatPayEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3QingDaoWanFu\Overlays\StatPayList_Ext.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3QingDaoWanFu\Reports\ButcherPigInfo.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -173,6 +176,9 @@
     <Compile Include="Pages\B3QingDaoWanFu\Reports\PayInfoExport.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3QingDaoWanFu\Reports\StatPayAnalyse.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3QingDaoWanFu\Tools\CarLoadingBySendLinePage.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -204,6 +210,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3QingDaoWanFu\Bills\CostRecord_\CostRecordList.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\B3QingDaoWanFu\Reports\StatPayAnalyse.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayList_Ext.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayList_Ext.cs
new file mode 100644
index 0000000..3280c84
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayList_Ext.cs
@@ -0,0 +1,20 @@
+using BWP.Web.Pages.B3ButcherManage.Bills.StatPay_;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TSingSoft.WebControls2;
+
+namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays
+{
+  class StatPayList_Ext : StatPayList
+  {
+    protected override void InitToolBar(TSingSoft.WebControls2.HLayoutPanel toolbar)
+    {
+      base.InitToolBar(toolbar);
+      var button = new TSButton("养殖户分析") { UseSubmitBehavior = false };
+      button.OnClientClick = "preventEventDefault(event);OpenUrlInTopTab('B3QingDaoWanFu/Reports/StatPayAnalyse.aspx','养殖户分析');";
+      toolbar.Add(button);
+    }
+  }
+}
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs
new file mode 100644
index 0000000..c32f422
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs
@@ -0,0 +1,138 @@
+using BWP.B3ButcherManage;
+using BWP.B3ButcherManage.BO;
+using BWP.B3Frameworks;
+using BWP.B3Frameworks.BO.MoneyTemplate;
+using BWP.Web.Layout;
+using BWP.Web.Utils;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.EnterpriseServices.SqlDoms;
+using Forks.Utils;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TSingSoft.WebControls2;
+using TSingSoft.WebPluginFramework;
+
+namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
+{
+  class StatPayAnalyse : DFGridReportPage<StatPay>
+  {
+    protected override string AccessRoleName
+    {
+      get { return "B3QingDaoWanFu.报表.结算单分析"; }
+    }
+
+    protected override string Caption
+    {
+      get { return "结算单分析"; }
+    }
+
+    protected override string QueryOptionsTabName
+    {
+      get
+      {
+        return "显示字段";
+      }
+    }
+
+    protected override void InitForm(System.Web.UI.HtmlControls.HtmlForm form)
+    {
+      base.InitForm(form);
+      mDFGrid.AllowRowGroup = true;
+    }
+
+    public override Forks.EnterpriseServices.DataForm.PagedDFDataTable GetPagedDFDataTable(TSingSoft.WebControls2.DFGrids.QuerySettings settings)
+    {
+      var result = base.GetPagedDFDataTable(settings);
+      if (ColumnNames.Contains("实付金额"))
+        result.Data.SumRow["实付金额"] = GetTotalActualMoney();
+      return result;
+    }
+
+    Money<金额>? GetTotalActualMoney()
+    {
+      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<金额>?>();
+    }
+
+    public override Forks.EnterpriseServices.DataForm.DFDataTable GetDFDataTable(TSingSoft.WebControls2.DFGrids.QuerySettings settings)
+    {
+      var result = base.GetDFDataTable(settings);
+      if (ColumnNames.Contains("实付金额"))
+        result.SumRow["实付金额"] = GetTotalActualMoney();
+      return result;
+    }
+
+    protected override void InitQueryPanel(WebControls.QueryPanel queryPanel)
+    {
+      base.InitQueryPanel(queryPanel);
+      queryPanel.ConditonPanel.EAdd(CreateDatePanel());
+    }
+
+    private HLayoutPanel CreateDatePanel()
+    {
+      var panel = new HLayoutPanel();
+      panel.Add(new SimpleLabel("核算日期"));
+      panel.Add(QueryCreator.DateRange(mDFInfo.Fields["Date"], mQueryContainer, "MinDate", "MaxDate", DateTime.Today, null));
+      return panel;
+    }
+
+    protected override void AddQueryControls(VLayoutPanel vPanel)
+    {
+      var layout = new LayoutManager("Main", mDFInfo, mQueryContainer);
+
+      var config = new AutoLayoutConfig { Cols = 4 };
+      config.Add("ID");
+      config.Add("BillState");
+      config.Add("Supplier_ID");
+      config.Add("Employee_ID");
+      config.Add("PurchaseType_ID");
+      config.Add("Weigh_ID");
+      config.Add("WeighTime");
+
+      layout.Config = config;
+      vPanel.Add(layout.CreateLayout());
+    }
+
+    ReportDisplayOptionHelper mDisplayHelper = new ReportDisplayOptionHelper();
+    protected override void AddQueryOptions(VLayoutPanel vPanel)//显示字段
+    {
+      mDisplayHelper.AddOptionItem("结算单号", "_bill", "ID", false);
+      mDisplayHelper.AddOptionItem("结算日期", "_bill", "Date", false);
+      mDisplayHelper.AddOptionItem("过磅单号", "_bill", "Weigh_ID", false);
+      mDisplayHelper.AddOptionItem("过磅日期", "_bill", "WeighTime", false);
+      mDisplayHelper.AddOptionItem("实付金额", "_bill", "ActualMoney", false);
+
+      mDisplayHelper.AddOptionItem("养殖户", "_detail", "Farmer_Name", false);
+      mDisplayHelper.AddOptionItem("身份证号", "_detail", "Farmer_IDCard", false);
+      mDisplayHelper.AddOptionItem("地址", "_detail", "Farmer_Address", false);
+      mDisplayHelper.AddOptionItem("电话", "_detail", "Farmer_Tel", false);
+      mDisplayHelper.AddOptionItem("棚前头数", "_detail", "Number", false, true);
+      mDisplayHelper.AddOptionItem("棚前重量", "_detail", "ExeWeight", false, true);
+      mDisplayHelper.AddOptionItem("棚前金额", "_detail", "ExtMoney", false, true);
+      AddQueryOption("选项", mDisplayHelper.GetAllDisplayNames(), mDisplayHelper.GetDefaultSelelectedDisplayNames());
+
+      base.AddQueryOptions(vPanel);
+    }
+
+
+    protected override DQueryDom GetQueryDom()
+    {
+      var query = base.GetQueryDom();
+      var root = query.From.RootSource.Alias;
+      var detail = new JoinAlias("_detail", typeof(Weigh_FarmerDetail));
+      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.AddSelectColumns(query, (name) => OptionIsSelected("选项", name), SumColumnNames, ColumnNames);
+      query.Where.Conditions.Add(DQCondition.EQ(root, "Domain_ID", DomainContext.Current.ID));
+      return query;
+    }
+  }
+}
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.xml b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.xml
new file mode 100644
index 0000000..cafd100
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Select xmlns="urn:XDQuery">
+  <Columns>
+
+  </Columns>
+  <From>
+    <DmoClass class="BWP.B3ButcherManage.BO.StatPay, B3ButcherManage" alias="_bill"/>
+  </From>
+  <Where>
+    <And>
+      <EQ>
+        <Field name="ID"/>
+        <QBE paramName="ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Supplier_ID"/>
+        <QBE paramName="Supplier_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Employee_ID"/>
+        <QBE paramName="Employee_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="PurchaseType_ID"/>
+        <QBE paramName="PurchaseType_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Weigh_ID"/>
+        <QBE paramName="Weigh_ID"/>
+      </EQ>
+      <GreaterThanOrEqual>
+        <Field name="Date"/>
+        <QBE paramName="MinDate" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="Date"/>
+        <QBE paramName="MaxDate"/>
+      </LessThanOrEqual>
+      <GreaterThanOrEqual>
+        <Field name="WeighTime"/>
+        <QBE paramName="MinWeighTime" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="WeighTime"/>
+        <QBE paramName="MaxWeighTime"/>
+      </LessThanOrEqual>
+      <EQ>
+        <Field name="BillState"/>
+        <QBE paramName="BillState"/>
+      </EQ>
+    </And>
+  </Where>
+</Select>
\ No newline at end of file
diff --git a/B3QingDaoWanFu.Web/PluginClass.cs b/B3QingDaoWanFu.Web/PluginClass.cs
index 0ff7a9d..edb2af1 100644
--- a/B3QingDaoWanFu.Web/PluginClass.cs
+++ b/B3QingDaoWanFu.Web/PluginClass.cs
@@ -20,6 +20,7 @@ namespace BWP.B3QingDaoWanFu
       WpfPageFactory.RegisterPageOverlay(typeof(StatPayEdit).FullName, typeof(StatPayEdit_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(StatPayAnalyse).FullName, typeof(StatPayAnalyse_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(SaleOutStoreEdit).FullName, typeof(SaleOutStoreEdit_Ext).FullName);
+      WpfPageFactory.RegisterPageOverlay(typeof(StatPayList).FullName, typeof(StatPayList_Ext).FullName);
       GlobalFlags.On(B3ButcherManageConsts.GlobalFlags.StatPayAddRewardWithButcherUseWeight);
       GlobalFlags.On(B3SaleConsts.Flags.MarketingActivityEnableAdjustPrice);
       GlobalFlags.On(B3SaleConsts.Flags.SendOutStoreNoAvailableStorage);
diff --git a/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs
index 504659d..3833ad3 100644
--- a/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs
+++ b/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs
@@ -58,14 +58,14 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
       }
     }
 
-    List<Tuple<long, decimal?, decimal?>> GetFarmerDetail(IDmoSession session, long weightID)
+    List<Tuple<long, int?, decimal?>> GetFarmerDetail(IDmoSession session, long weightID)
     {
       var query = new DQueryDom(new JoinAlias(typeof(Weigh_FarmerDetail)));
       query.Where.Conditions.Add(DQCondition.EQ("Weigh_ID", weightID));
       query.Columns.Add(DQSelectColumn.Field("ID"));
       query.Columns.Add(DQSelectColumn.Field("Number"));
       query.Columns.Add(DQSelectColumn.Field("Money"));
-      return query.EExecuteList<long, decimal?, decimal?>(session);
+      return query.EExecuteList<long, int?, decimal?>(session);
     }
 
     void UpdateProperty(long id, IDmoSession session, params Tuple<string, object>[] par)
diff --git a/WebFolder/config/plugins/B3QingDaoWanFu.plugin b/WebFolder/config/plugins/B3QingDaoWanFu.plugin
index 2920803..629bd45 100644
--- a/WebFolder/config/plugins/B3QingDaoWanFu.plugin
+++ b/WebFolder/config/plugins/B3QingDaoWanFu.plugin
@@ -22,6 +22,7 @@
       <Function index="0" name="收购综合报表"/>
       <Function index="1" name="异常猪分析"/>
       <Function index="2" name="付款清单导出"/>
+      <Function index="3" name="结算单分析"/>
     </FunctionGroup>
     <FunctionGroup name="配置" roleSchemas="employee">
       <Function index="0" name="结账客户设备配置"/>