From c540f5efea519e1c790712c21e3a1be7ea58e0f0 Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Tue, 9 Jan 2018 17:47:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138139=20?=
 =?UTF-8?q?=E3=80=90=E4=BA=A7=E5=93=81=E5=8C=85=E8=A3=85=E7=89=A9=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E3=80=91=E4=B8=8A=E7=82=B9=E5=87=BB=E2=80=98=E5=B7=B2?=
 =?UTF-8?q?=E9=85=8D=E4=BA=A7=E5=93=81=E2=80=99=E6=98=BE=E7=A4=BA=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E7=BB=93=E6=9E=9C=E5=8F=97=E4=BC=9A=E8=AE=A1=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E6=9D=83=E9=99=90=E6=95=B0=E6=8E=A7=E5=88=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs
index 9e58f9a..a5f3738 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs
@@ -226,6 +226,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill
             var temp = new JoinAlias(typeof(TempPackage));
             var temp2 = new JoinAlias(typeof(TempPackage2));
             var dom = new DQueryDom(goods);
+            OrganizationUtil.RegisterOrganizationQueryTable(dom);
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(goods, "ID"), "Goods_ID"));
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(goods, "Name"), "产品"));
             if (configured)
@@ -264,7 +265,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill
                 dom.RegisterQueryTable(typeof(TempPackage), new[] { "Goods_ID" }, GetTempDom());
                 dom.From.AddJoin(JoinType.Left, new DQDmoSource(temp), DQCondition.EQ(temp, "Goods_ID", goods, "ID"));
                 dom.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(temp, "Goods_ID")));
-            }
+      }
             if (!string.IsNullOrEmpty(_goodsDfc.Value))
             {
                 dom.Where.Conditions.Add(DQCondition.EQ("ID", _goodsDfc.Value));
@@ -324,8 +325,8 @@ namespace BWP.Web.Pages.B3YunKen.Bill
             {
                 dom.Where.Conditions.Add(DQCondition.EQ(acc, "ID", _accountingUnitDfc.Value));
             }
-            //AuthorizeUtil.AddOrganizationAuthorising(dom, new KeyValuePair<string, string>("acc", "Organization_ID"));
-            //OrganizationUtil.AddOrganizationLimit(dom, typeof(AccountingUnit), acc);
+      //AuthorizeUtil.AddOrganizationAuthorising(dom, new KeyValuePair<string, string>("acc", "Organization_ID"));
+      OrganizationUtil.AddOrganizationLimit(dom, typeof(AccountingUnit), acc);
             return dom;
         }
 

From b1a962ab59abfe0138659bf52f9809e7b18a5285 Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Wed, 10 Jan 2018 11:11:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138148=20?=
 =?UTF-8?q?=E3=80=90=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E3=80=91=E7=9A=84?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
index c73a23d..d54a2b1 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using System.Text;
 using BWP.Web.Layout;
 using TSingSoft.WebControls2;
+using BWP.Web.Utils;
+using BWP.B3Sale.Utils;
 
 namespace BWP.Web.Pages.B3YunKen.Overlays
 {
@@ -33,6 +35,18 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
       config.Add("Carrier_ID");
     }
 
+    protected override void OverrideSaleKindId(LayoutManager layoutManager, AutoLayoutConfig config)
+    {
+      layoutManager.Add("SaleKind_ID", QueryCreator.DFChoiceBox(mDFInfo.Fields["SaleKind_ID"], B3SaleDataSources.销售类型));
+      config.Add("SaleKind_ID");
+    }
+
+    public override void AppToUI()
+    {
+      base.AppToUI();
+      mDFContainer.MakeReadonly("SaleKind_ID",!CheckDefaultRole("编辑销售类型"));
+    }
+
     protected override void AddLayOutManagerScript(LayoutManager layoutPanel)
     {
       base.AddLayOutManagerScript(layoutPanel);