From 1e0b23259a4b40a859bffff72b22bf42e176f135 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Tue, 25 Sep 2018 11:40:58 +0800
Subject: [PATCH] .

---
 .../B3ButcherManageToSale.Web.csproj          |  6 ++
 .../Overlays/OrderMatchPage.cs                | 71 +++++++++++++++++++
 .../Overlays/OrderMatchPage.xml               | 28 ++++++++
 .../OutputToSaleOutDiff.cs                    |  2 +-
 4 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Overlays/OrderMatchPage.cs
 create mode 100644 B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Overlays/OrderMatchPage.xml

diff --git a/B3ButcherManageToSale.Web/B3ButcherManageToSale.Web.csproj b/B3ButcherManageToSale.Web/B3ButcherManageToSale.Web.csproj
index 6b908af..4517f8a 100644
--- a/B3ButcherManageToSale.Web/B3ButcherManageToSale.Web.csproj
+++ b/B3ButcherManageToSale.Web/B3ButcherManageToSale.Web.csproj
@@ -99,6 +99,9 @@
     <Compile Include="Pages\B3ButcherManageToSale\Overlays\CustomerAdjust.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3ButcherManageToSale\Overlays\OrderMatchPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3ButcherManageToSale\Overlays\SaleOutStoreBalance.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -114,6 +117,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3ButcherManageToSale\Reports\OutputToSaleOutDiff_\OutputToSaleOutDiff.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\B3ButcherManageToSale\Overlays\OrderMatchPage.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/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Overlays/OrderMatchPage.cs b/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Overlays/OrderMatchPage.cs
new file mode 100644
index 0000000..d8ba358
--- /dev/null
+++ b/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Overlays/OrderMatchPage.cs
@@ -0,0 +1,71 @@
+using BWP.B3Frameworks;
+using BWP.B3Frameworks.Utils;
+using BWP.B3Sale.BO;
+using BWP.Web.Layout;
+using BWP.Web.Utils;
+using BWP.Web.WebControls;
+using Forks.EnterpriseServices.DataForm;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.EnterpriseServices.SqlDoms;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.UI.WebControls;
+using TSingSoft.WebControls2;
+
+namespace BWP.Web.Pages.B3ButcherManageToSale.Overlays
+{
+  class OrderMatchPage : B3ButcherManage.Tools.OrderMatchPage
+  {
+    QueryContainer mQueryContainer;
+    readonly DFInfo _dFInfo;
+    public OrderMatchPage()
+    {
+      var type = this.GetType();
+      mQueryContainer = QueryContainer.FromResource(type.FullName + ".xml", type.Assembly);
+      _dFInfo = DFInfo.Get(typeof(Order));
+    }
+
+    DFBrowseGrid _browseGrid;
+    protected override void InitForm(System.Web.UI.HtmlControls.HtmlForm form)
+    {
+      base.InitForm(form);
+      CreateQueryPanel(form.EAdd(new VLayoutPanel()));
+      CreateResultPanel(form.EAdd(new TitlePanel("查询结果")));
+    }
+
+    private void CreateQueryPanel(VLayoutPanel panel)
+    {
+      var manager = new LayoutManager("", _dFInfo, mQueryContainer);
+      manager.Add("AccountingUnit_ID", QueryCreator.DFChoiceBox(_dFInfo.Fields["AccountingUnit_ID"], B3FrameworksConsts.DataSources.授权会计单位全部));
+      manager.Add("Department_ID", QueryCreator.DFChoiceBox(_dFInfo.Fields["Department_ID"], B3FrameworksConsts.DataSources.授权部门全部));
+
+      manager.Add("LoadTime", QueryCreator.TimeRange(_dFInfo.Fields["LoadTime"], mQueryContainer, "MinLoadTime", "MaxLoadTime", DateTime.Today, DateTime.Today + new TimeSpan(23, 59, 59)));
+      var config = manager.CreateDefaultConfig(6);
+      config.Expand = false;
+      panel.Add(manager.CreateLayout());
+      var hPanel = panel.Add(new HLayoutPanel(), new VLayoutOption(HorizontalAlign.Left));
+      hPanel.Add(new TSButton("查询", delegate
+      {
+        StartQuery();
+      }));
+    }
+
+    private void CreateResultPanel(TitlePanel titlePanel)
+    {
+      _browseGrid = new DFBrowseGrid(new DFDataTableEditor()) { Width = Unit.Percentage(100) };
+      _browseGrid.Columns.Add(new DFBrowseGridAutoColumn());
+    }
+
+    private void StartQuery()
+    {
+
+    }
+
+    DQueryDom GetQueryDom()
+    {
+      return null;
+    }
+  }
+}
diff --git a/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Overlays/OrderMatchPage.xml b/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Overlays/OrderMatchPage.xml
new file mode 100644
index 0000000..a6d02c0
--- /dev/null
+++ b/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Overlays/OrderMatchPage.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Select xmlns="urn:XDQuery">
+  <Columns>
+  </Columns>
+  <From>
+      <DmoClass class="BWP.B3Sale.BO.Order, B3Sale" alias="main"/>
+  </From>
+  <Where>
+    <And>
+      <EQ>
+        <Field name="AccountingUnit_ID"/>
+        <QBE paramName="AccountingUnit_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Department_ID"/>
+        <QBE paramName="Department_ID"/>
+      </EQ>
+      <GreaterThanOrEqual>
+        <Field name="LoadTime"/>
+        <QBE paramName="MinLoadTime" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="LoadTime"/>
+        <QBE paramName="MaxLoadTime"/>
+      </LessThanOrEqual>
+    </And>
+  </Where>
+</Select>
\ No newline at end of file
diff --git a/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Reports/OutputToSaleOutDiff_/OutputToSaleOutDiff.cs b/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Reports/OutputToSaleOutDiff_/OutputToSaleOutDiff.cs
index 243c092..d88e0e9 100644
--- a/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Reports/OutputToSaleOutDiff_/OutputToSaleOutDiff.cs
+++ b/B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Reports/OutputToSaleOutDiff_/OutputToSaleOutDiff.cs
@@ -100,7 +100,7 @@ namespace BWP.Web.Pages.B3ButcherManageToSale.Reports.OutputToSaleOutDiff_
     public long Goods_ID { get; set; }
     public Money<decimal>? UnitNum { get; set; }
     public Money<decimal>? SecondNumber { get; set; }
-    public Money<decimal?> OutUnitNum { get; set; }
+    public Money<decimal>? OutUnitNum { get; set; }
     public Money<decimal>? OutSecondNumber { get; set; }
 
     public static void Register(DQueryDom root, DateTime minDate, DateTime maxDate, IEnumerable<long> storeID)