From c11f93de0cc87c9b81b26c3f7b173464ed579aca Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Fri, 23 Nov 2018 16:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8C=89=E7=85=A7=E9=80=81=E8=B4=A7=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E9=A1=BA=E5=BA=8F=E6=8E=92=E5=BA=8F=E3=80=82=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E5=9C=A8=E4=B8=BB=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E5=88=B0=E4=BA=86=E5=85=B6=E4=BB=96=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=AA=E5=88=B0=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj  |  3 ++
 .../Overlays/SaleOutStoreList_Ext.cs          | 31 +++++++++++++++++++
 B3QingDaoWanFu.Web/PluginClass.cs             |  1 +
 3 files changed, 35 insertions(+)
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs

diff --git a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
index 5a3616f..3efb91e 100644
--- a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
+++ b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
@@ -190,6 +190,9 @@
     <Compile Include="Pages\B3QingDaoWanFu\Overlays\PayList_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3QingDaoWanFu\Overlays\SaleOutStoreList_Ext.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3QingDaoWanFu\Reports\PayAnalyse.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs
new file mode 100644
index 0000000..d60da1a
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs
@@ -0,0 +1,31 @@
+using BWP.B3Sale.BO;
+using BWP.Web.Pages.B3Sale.Bills.SaleOutStore_;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.EnterpriseServices.SqlDoms;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays
+{
+  class SaleOutStoreList_Ext : SaleOutStoreList
+  {
+    protected override DQueryDom GetQueryDom()
+    {
+      var query = base.GetQueryDom();
+      if (query.OrderBy.Expressions.Count == 0)
+      {
+        var root = query.From.RootSource.Alias;
+        var lineDetail = new JoinAlias("lineDetail", typeof(DeliverGoodsLine_Detail));
+        query.From.AddJoin(JoinType.Left, new DQDmoSource(lineDetail), DQCondition.And(DQCondition.EQ(root, "DeliverGoodsLine_ID", lineDetail, "DeliverGoodsLine_ID"), DQCondition.EQ(root, "Customer_ID", lineDetail, "Customer_ID")));
+
+        query.OrderBy.Expressions.Add(DQOrderByExpression.Create(root, "SequenceNumber"));
+        query.OrderBy.Expressions.Add(DQOrderByExpression.Create(lineDetail, "SequenceNumber"));
+      }
+
+      return query;
+    }
+  }
+}
diff --git a/B3QingDaoWanFu.Web/PluginClass.cs b/B3QingDaoWanFu.Web/PluginClass.cs
index c8e86b3..41e0201 100644
--- a/B3QingDaoWanFu.Web/PluginClass.cs
+++ b/B3QingDaoWanFu.Web/PluginClass.cs
@@ -30,6 +30,7 @@ namespace BWP.B3QingDaoWanFu
       WpfPageFactory.RegisterPageOverlay(typeof(WeighBillEdit).FullName, typeof(WeightBillEdit_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(WeighBillList).FullName, typeof(WeighBillList_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(BWP.Web.Pages.B3ButcherManage.Bills.Pay_.SelectStatPayDialog).FullName, typeof(SelectStatPayDialog_Ext).FullName);
+      WpfPageFactory.RegisterPageOverlay(typeof(BWP.Web.Pages.B3Sale.Bills.SaleOutStore_.SaleOutStoreList).FullName, typeof(SaleOutStoreList_Ext).FullName);
       GlobalFlags.On(B3ButcherManageConsts.GlobalFlags.StatPayAddRewardWithButcherUseWeight);
       GlobalFlags.On(B3SaleConsts.Flags.MarketingActivityEnableAdjustPrice);
       GlobalFlags.On(B3SaleConsts.Flags.SendOutStoreNoAvailableStorage);