From 7e54e4508f496b622c854425eecf9577a2e294fe Mon Sep 17 00:00:00 2001
From: wushukun <18860363876@163.com>
Date: Wed, 22 Nov 2017 14:04:07 +0800
Subject: [PATCH] ..

---
 B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj  |  60 +++++-
 .../Reports/ComprehensiveReport.cs            | 195 ++++++++++++++++++
 .../Reports/ComprehensiveReport.xml           |  55 +++++
 B3QingDaoWanFu/B3QingDaoWanFu.csproj          |  48 ++---
 .../config/plugins/B3QingDaoWanFu.plugin      |   6 +-
 5 files changed, 328 insertions(+), 36 deletions(-)
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml

diff --git a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
index 7fcea1d..44e3060 100644
--- a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
+++ b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BWP.Web</RootNamespace>
     <AssemblyName>B3QingDaoWanFu.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <KeyContainerName>BwpApp</KeyContainerName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,81 +34,120 @@
     <Reference Include="B3ButcherManage, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3ButcherManage.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="B3ButcherManage.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3ButcherManage.Web.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="B3Frameworks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3Frameworks.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="B3Frameworks.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3Frameworks.Web.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="B3Procurement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3Procurement.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="B3ProcurementInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3ProcurementInterface.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="B3ProduceUnitedInfos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3ProduceUnitedInfos.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="B3UnitedInfos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3UnitedInfos.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Forks.EnterpriseServices.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Forks.Utils, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Forks.Utils.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Core">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Web">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Microsoft.CSharp">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Data">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Xml">
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
     <Reference Include="TSingSoft.WebControls2, Version=2.1.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\TSingSoft.WebControls2.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Wpf, Version=1.3.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Wpf.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Wpf.System, Version=1.3.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Wpf.System.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Wpf.System.Web, Version=1.3.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Wpf.System.Web.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\version\Customer_version.cs">
+      <Link>Customer_version.cs</Link>
+    </Compile>
     <Compile Include="Pages\B3QingDaoWanFu\Overlays\StatPayAnalyse_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Pages\B3QingDaoWanFu\Overlays\StatPayEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3QingDaoWanFu\Reports\ComprehensiveReport.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="PluginClass.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Pages\TypeIOCs\" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\B3QingDaoWanFu\Reports\ComprehensiveReport.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/Reports/ComprehensiveReport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs
new file mode 100644
index 0000000..74ad75b
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs
@@ -0,0 +1,195 @@
+using BWP.B3ButcherManage.BO;
+using BWP.B3ButcherManage.NamedValueTemplate;
+using BWP.B3Frameworks.BO.NamedValueTemplate;
+using BWP.Web.Layout;
+using BWP.Web.Utils;
+using BWP.Web.WebControls;
+using Forks.EnterpriseServices;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.Utils;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.UI.WebControls;
+using TSingSoft.WebControls2;
+
+namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
+{
+  public class ComprehensiveReport : DFBrowseGridReportPage<StatPay>
+  {
+    protected override string Caption
+    {
+      get { return "收购综合报表"; }
+    }
+    protected override string QueryOptionsTabName
+    {
+      get
+      {
+        return "显示字段";
+      }
+    }
+    protected override string AccessRoleName
+    {
+      get { return "B3QingDaoWanFu.报表.收购综合报表"; }
+    }
+
+    protected override void AddQueryControls(VLayoutPanel vPanel)
+    {
+      var layoutManager = new LayoutManager("Main", mDFInfo, mQueryContainer);
+
+    
+
+      DFNamedValueInput<单据状态> input;
+      layoutManager.Add("BillState", input = QueryCreator.一般单据状态(mDFInfo.Fields["BillState"], true));
+      input.Value = 单据状态.已审核;
+      var config = new AutoLayoutConfig() { Cols = 2 };      
+
+      config.Add("AccountingUnit_ID");
+      config.Add("ID");
+      config.Add("BillState");
+      config.Add("Supplier_ID");
+      config.Add("SupplierClass_ID");
+      config.Add("Employee_ID");
+      config.Add("ValuationArea_ID");
+      config.Add("PurchaseType");
+      config.Add("Date");
+      layoutManager.Config = config;
+      vPanel.Add(layoutManager.CreateLayout());
+    }
+
+
+    private CheckBoxListWithReverseSelect _checkbox;
+    protected override void InitQueryPanel(QueryPanel queryPanel)
+    {
+      base.InitQueryPanel(queryPanel);
+      var panel = queryPanel.CreateTab("显示字段");
+      _checkbox = new CheckBoxListWithReverseSelect { RepeatColumns = 6, RepeatDirection = RepeatDirection.Horizontal };
+      _checkbox.Items.Add(new ListItem("收购日期", "WeighTime"));
+      _checkbox.Items.Add(new ListItem("收购类型", "PurchaseType"));
+      _checkbox.Items.Add(new ListItem("供应商", "Supplier_Name"));
+      _checkbox.Items.Add(new ListItem("来源地", "Supplier_Address"));
+      _checkbox.Items.Add(new ListItem("过磅单号", "Weigh_ID"));
+      _checkbox.Items.Add(new ListItem("收购日期", "WeighTime"));
+      _checkbox.Items.Add(new ListItem("收购头数", "RealNumber"));
+      _checkbox.Items.Add(new ListItem("毛猪等级", ""));//todo
+      _checkbox.Items.Add(new ListItem("棚前重量", "ShackWeight"));
+      _checkbox.Items.Add(new ListItem("收购重量", "RealWeight"));
+      _checkbox.Items.Add(new ListItem("损耗", "损耗"));
+      _checkbox.Items.Add(new ListItem("损耗比%", "损耗比%"));
+      _checkbox.Items.Add(new ListItem("烫褪头数", "烫褪头数"));
+      _checkbox.Items.Add(new ListItem("工艺", "Technics"));
+      _checkbox.Items.Add(new ListItem("头数", "Number"));
+      _checkbox.Items.Add(new ListItem("级别重量", "级别重量"));
+
+      _checkbox.Items.Add(new ListItem("皮重", "皮重"));
+      _checkbox.Items.Add(new ListItem("皮肉重量", "皮肉重量"));
+
+      _checkbox.Items.Add(new ListItem("皮肉比%", "皮肉比%"));
+      _checkbox.Items.Add(new ListItem("一二级比%", "一二级比%"));
+      _checkbox.Items.Add(new ListItem("价格金额", "价格金额"));
+      _checkbox.Items.Add(new ListItem("宰前扣款", "宰前扣款"));
+      _checkbox.Items.Add(new ListItem("死猪扣款", "死猪扣款"));
+      _checkbox.Items.Add(new ListItem("宰后扣款", "宰后扣款"));
+      _checkbox.Items.Add(new ListItem("收购金额", "ActualMoney"));
+      _checkbox.Items.Add(new ListItem("核算金额", "Money"));
+      _checkbox.Items.Add(new ListItem("收购单价", "收购单价"));
+      _checkbox.Items.Add(new ListItem("实际单价", "实际单价"));
+      _checkbox.Items.Add(new ListItem("核算单价", "RawPrice"));
+      _checkbox.Items.Add(new ListItem("合并单元格") { Selected = false });
+      panel.EAdd(_checkbox);
+      mQueryControls.Add("显示字段", _checkbox);
+      mQueryControls.EnableHoldLastControlNames.Add("显示字段");
+    }
+
+    protected override DQueryDom GetQueryDom()
+    {
+      var query = base.GetQueryDom();
+      var bill = JoinAlias.Create("bill");
+
+
+      //屠宰明细
+      var detail = new JoinAlias(typeof(StatPay_Butcher));
+      query.From.AddJoin(Forks.EnterpriseServices.SqlDoms.JoinType.Inner, new DQDmoSource(detail), DQCondition.EQ(bill, "ID", detail, "StatPay_ID"));
+
+      foreach (ListItem field in _checkbox.Items)
+      {
+        if (field.Selected)
+        {
+          switch (field.Text)
+          {
+            case "会计单位":
+
+          }
+        }
+      }
+
+
+
+
+              //if (UseWeightSumRate2)
+              //{
+              //  DetailTemp.Register(query);
+              //  var details = new JoinAlias("_temp1", typeof(DetailTemp));
+              //  query.From.AddJoin(JoinType.Left, new DQDmoSource(details), DQCondition.EQ(bill, "ID", details, "ID"));
+              //  mDisplayOptionHelper.AddAlias("_temp1", details);
+
+              //  ButcherTemp.Register(query);
+              //  var totaoMao = new JoinAlias("_butcherTemp", typeof(ButcherTemp));
+              //  query.From.AddJoin(JoinType.Left, new DQDmoSource(totaoMao), DQCondition.EQ(details, "Butcher_ID", totaoMao, "ID"));
+              //  mDisplayOptionHelper.AddAlias("_butcherTemp", totaoMao);
+
+              //  ByProductRecordTemp.Register(query);
+              //  var bpr = new JoinAlias("_bpr", typeof(ByProductRecordTemp));
+              //  query.From.AddJoin(JoinType.Left, new DQDmoSource(bpr), DQCondition.And(DQCondition.EQ(bill, "AccountingUnit_ID", bpr, "AccountingUnit_ID"), DQCondition.EQ(totaoMao, "Date", bpr, "Date")));
+              //  mDisplayOptionHelper.AddAlias("_bpr", bpr);
+              //}
+
+
+
+
+              mDisplayOptionHelper.AddSelectColumns(query, (name) => OptionIsSelected("显示字段", name), SumColumnIndexs, GroupSumColumnIndexs);
+      return query;
+    }
+
+  }
+
+  class tempUnionButcher
+  {
+    public long StatPay_ID { get; set; }
+
+    [LogicName("级别")]
+    public string Livestock_Name { get; set; }
+
+    [LogicName("级别")]
+    public long? Livestock_ID { get; set; }
+
+    [LogicName("工艺")]
+    public NamedValue<工艺>? Technics { get; set; }
+
+
+    [LogicName("头数")]
+    public int? Number { get; set; }
+
+    [LogicName("重量")]
+    public Money<decimal>? Weight { get; set; }
+
+
+
+
+    public static void Register(DQueryDom root)
+    {
+      var butcher = new JoinAlias("butcher", typeof(StatPay_Butcher));
+      var butcherQuery = new DQueryDom(butcher);
+      butcherQuery.Columns.Add(DQSelectColumn.Field("StatPay_ID"));
+      butcherQuery.Columns.Add(DQSelectColumn.Field("Livestock_ID"));
+      butcherQuery.Columns.Add(DQSelectColumn.Field("Livestock_Name"));
+      butcherQuery.Columns.Add(DQSelectColumn.Field("Technics"));
+      butcherQuery.Columns.Add(DQSelectColumn.Field("Number"));
+      butcherQuery.Columns.Add(DQSelectColumn.Field("Weight"));
+      root.RegisterQueryTable(typeof(tempUnionButcher), new string[] { "StatPay_ID", "Livestock_ID", "Livestock_Name", "Technics", "Number", "Weight" }, butcherQuery);
+
+    }
+  }
+}
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml
new file mode 100644
index 0000000..a383a34
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Select xmlns="urn:XDQuery">
+  <Columns>
+    <Field name="ID"/>
+  </Columns>
+  <From>
+    <DmoClass class="BWP.B3ButcherManage.BO.StatPay, B3ButcherManage" alias="bill"/>
+
+  </From>
+  <Where>
+    <And>
+      <EQ>
+        <Field name="ID" alias="bill"/>
+        <QBE paramName="ID"/>
+      </EQ>
+      <EQ>
+        <Field name="AccountingUnit_ID" alias="bill"/>
+        <QBE paramName="AccountingUnit_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Department_ID" alias="bill"/>
+        <QBE paramName="Department_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Employee_ID" alias="bill"/>
+        <QBE paramName="Employee_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Store_ID" alias="bill"/>
+        <QBE paramName="Store_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="ProductBatch" alias="bill"/>
+        <QBE paramName="ProductBatch"/>
+      </EQ>
+      <EQ>
+        <Field name="Employee_ID" alias="bill"/>
+        <QBE paramName="Employee_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="OtherInStoreType_ID" alias="bill"/>
+        <QBE paramName="OtherInStoreType_ID"/>
+      </EQ>
+
+      <GreaterThanOrEqual>
+        <Field name="Date" alias="bill"/>
+        <QBE paramName="MinDate" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="Date" alias="bill"/>
+        <QBE paramName="MaxDate"/>
+      </LessThanOrEqual>
+    </And>
+  </Where>
+</Select>
\ No newline at end of file
diff --git a/B3QingDaoWanFu/B3QingDaoWanFu.csproj b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
index f7a283c..220c365 100644
--- a/B3QingDaoWanFu/B3QingDaoWanFu.csproj
+++ b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BWP.B3QingDaoWanFu</RootNamespace>
     <AssemblyName>B3QingDaoWanFu</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
+  <KeyContainerName>BwpApp</KeyContainerName></PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -33,65 +33,65 @@
     <Reference Include="B3ButcherManage, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3ButcherManage.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3ButcherManage.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3ButcherManage.Web.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3Frameworks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3Frameworks.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3Frameworks.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3Frameworks.Web.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3Procurement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3Procurement.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3ProcurementInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3ProcurementInterface.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3ProduceUnitedInfos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3ProduceUnitedInfos.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3UnitedInfos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3UnitedInfos.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Forks.EnterpriseServices.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="Forks.Utils, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Forks.Utils.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Private>False</Private></Reference>
+    <Reference Include="System"><SpecificVersion>False</SpecificVersion></Reference>
+    <Reference Include="System.Core"><SpecificVersion>False</SpecificVersion></Reference>
+    <Reference Include="System.Xml.Linq"><SpecificVersion>False</SpecificVersion></Reference>
+    <Reference Include="System.Data.DataSetExtensions"><SpecificVersion>False</SpecificVersion></Reference>
+    <Reference Include="Microsoft.CSharp"><SpecificVersion>False</SpecificVersion></Reference>
+    <Reference Include="System.Data"><SpecificVersion>False</SpecificVersion></Reference>
+    <Reference Include="System.Xml"><SpecificVersion>False</SpecificVersion></Reference>
     <Reference Include="TSingSoft.WebControls2, Version=2.1.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\TSingSoft.WebControls2.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="Wpf, Version=1.3.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Wpf.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="Wpf.System, Version=1.3.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Wpf.System.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\version\Customer_version.cs"><Link>Customer_version.cs</Link></Compile><Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TypeIOCs\StatPayBLTypeIoc.cs" />
     <Compile Include="Utils\WanFuOnlineConfig.cs" />
   </ItemGroup>
diff --git a/WebFolder/config/plugins/B3QingDaoWanFu.plugin b/WebFolder/config/plugins/B3QingDaoWanFu.plugin
index 7bd65e1..2151f2d 100644
--- a/WebFolder/config/plugins/B3QingDaoWanFu.plugin
+++ b/WebFolder/config/plugins/B3QingDaoWanFu.plugin
@@ -17,11 +17,13 @@
   <Profiles>
   </Profiles>
   <Security>
-
+    <FunctionGroup name="报表" roleSchemas="employee">
+      <Function index="0" name="收购综合报表"/>     
+    </FunctionGroup>
 
   </Security>
   <Menus>
-
+    <Menu  id="0001"  name="/B3青岛万福/报表/收购综合报表" roles="B3QingDaoWanFu.报表.收购综合报表" url="B3QingDaoWanFu/Reports/ComprehensiveReport.aspx"/>
   </Menus>
   <Features>
   </Features>