From 5e444fbe37d5f4db215b9cd74853f20da0fcf75d Mon Sep 17 00:00:00 2001
From: robin <robin333999@gmail.com>
Date: Wed, 29 Nov 2017 14:30:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../B3_DongFangWanQi/Tools/SaleOederUpdateList.cs     | 11 +++++++----
 .../B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs     |  8 +++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOederUpdateList.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOederUpdateList.cs
index b837439..e8f63b4 100644
--- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOederUpdateList.cs
+++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOederUpdateList.cs
@@ -208,11 +208,12 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       var goodsProperty = new JoinAlias(typeof(GoodsProperty));
       var storeDetail = new JoinAlias(typeof(StoreDetailTmp));
       var output = new JoinAlias(typeof(OutputTmp));
-      var dom = new DQueryDom(bill);
+      var dom = new DQueryDom(bill);  
+      OrganizationUtil.RegisterOrganizationQueryTable(dom);
       dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID",   "Number", "SecondNumber", "UnitNum" }, GetOrderDQueryDom());
       dom.RegisterQueryTable(typeof(StoreDetailTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber" }, GetStoreDetailDQueryDom());
       dom.RegisterQueryTable(typeof(OutputTmp), new[] { "GoodsProperty_ID", "Number"  }, GetOutputDQueryDom());
-
+    
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(bill, "GoodsProperty_ID", goodsProperty, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(storeDetail), DQCondition.EQ(bill, "GoodsProperty_ID", storeDetail, "GoodsProperty_ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(output), DQCondition.EQ(bill, "GoodsProperty_ID", output, "GoodsProperty_ID"));
@@ -299,7 +300,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
 
       dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "ID")); 
       dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.未审核));
-      OrganizationUtil.AddOrganizationLimit(dom, typeof(Order));
+     
       dom.Where.Conditions.Add(DQCondition.EQ(bill, "Domain_ID", DomainContext.Current.ID));
       if (!_customerCatalogt.IsEmpty) {
         var strs = B3SaleWebUtil.GetDeepByTreeName(_customerCatalogt.DisplayValue);
@@ -312,7 +313,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
         dom.Where.Conditions.Add(DQCondition.Or(conditions));
       }
       uint id = ViewStateUtil.Current.SaveToPersistenceMedium(dom.Where.Conditions);
-      hidden.Value = id.ToString();
+      hidden.Value = id.ToString(); 
+      OrganizationUtil.AddOrganizationLimit(dom, typeof(Order));
       return dom;
     }
 
@@ -394,5 +396,6 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
         DataBindGrid();
       }
     }
+     
   }
 }
diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs
index e8f57d6..73933dc 100644
--- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs
+++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs
@@ -329,7 +329,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", goods, "GoodsProperty_ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsPropertyCatalog), DQCondition.EQ(goodsProperty, "GoodsPropertyCatalog_ID", goodsPropertyCatalog, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(customer), DQCondition.EQ(order, "Customer_ID", customer, "ID"));
-
+      OrganizationUtil.RegisterOrganizationQueryTable(dom);
       dom.Columns.Add(DQSelectColumn.Field("ID", detailAlias));
       dom.Columns.Add(DQSelectColumn.Field("UnitNum", detailAlias));
       dom.Columns.Add(DQSelectColumn.Field("SecondNumber", detailAlias));
@@ -352,10 +352,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       }
       if (GoodsProperty_ID != null) {
         dom.Where.Conditions.Add(DQCondition.EQ(goodsProperty, "ID", GoodsProperty_ID));
-      }
-  
-      //dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.未审核));
-      //OrganizationUtil.AddOrganizationLimit(dom, typeof(Order));
+      } 
+      OrganizationUtil.AddOrganizationLimit(dom, typeof(Order));
       Details.Clear();
       using (var context = new TransactionContext()) {
         using (var reader = context.Session.ExecuteReader(dom)) {