From 982cb8f984e2a0c6413265166f4dc6372fb80bac Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Tue, 9 Jan 2018 15:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BB=93=E8=B4=A6=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj             |  4 +---
 .../BLActions/CustomerCreditPolicyBLAction.cs          | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index 8863859..99524d8 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -121,9 +121,7 @@
     <Compile Include="Pages\B3YunKen\Overlays\SaleOutStoreEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Pages\B3YunKen\Overlays\SelectProductNoticeDialog_Ext.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
+    <Compile Include="Pages\B3YunKen\Overlays\SelectProductNoticeDialog_Ext.cs" />
     <Compile Include="Pages\B3YunKen\ProductTask_\SaleOrderToProductNoticePage.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
diff --git a/BWP.B3_YunKen/BLActions/CustomerCreditPolicyBLAction.cs b/BWP.B3_YunKen/BLActions/CustomerCreditPolicyBLAction.cs
index 94abd23..0797f78 100644
--- a/BWP.B3_YunKen/BLActions/CustomerCreditPolicyBLAction.cs
+++ b/BWP.B3_YunKen/BLActions/CustomerCreditPolicyBLAction.cs
@@ -22,7 +22,7 @@ namespace BWP.B3_YunKen.BLActions
     public void Execute(Forks.EnterpriseServices.BusinessInterfaces.IDmoContext context, object dmo, object parameter)
     {
       var customer = dmo as Customer;
-      if (customer != null && customer.CreditPolicy_ID != null) {
+      if (customer.AccountCustomer_ID != null && customer.CreditPolicy_ID != null) {
         Tuple<long?, long> tuple = null;
         var detail = new JoinAlias(typeof(SaleCreditPolicy_Detail));
         var saleCreditPolicy = new JoinAlias(typeof(SaleCreditPolicy));
@@ -30,7 +30,7 @@ namespace BWP.B3_YunKen.BLActions
         query.From.AddJoin(JoinType.Left, new DQDmoSource(saleCreditPolicy), DQCondition.EQ(detail, "SaleCreditPolicy_ID", saleCreditPolicy, "ID"));
         query.Columns.Add(DQSelectColumn.Field("CreditPolicy_ID", saleCreditPolicy));
         query.Columns.Add(DQSelectColumn.Field("ID", saleCreditPolicy));
-        query.Where.Conditions.Add(DQCondition.EQ("Customer_ID", customer.ID));
+        query.Where.Conditions.Add(DQCondition.EQ("Customer_ID", customer.AccountCustomer_ID));
         using (var reader = context.Session.ExecuteReader(query)) {
           while (reader.Read()) {
             tuple = new Tuple<long?, long>((long?)reader[0], (long)reader[1]);
@@ -41,7 +41,7 @@ namespace BWP.B3_YunKen.BLActions
 
         if (tuple != null && tuple.Item1 != null) {
           var del = new DQDeleteDom(typeof(SaleCreditPolicy_Detail));
-          del.Where.Conditions.Add(DQCondition.EQ("Customer_ID", customer.ID));
+          del.Where.Conditions.Add(DQCondition.EQ("Customer_ID", customer.AccountCustomer_ID));
           context.Session.ExecuteNonQuery(del);
 
           var update = new DQUpdateDom(typeof(SaleCreditPolicy));
@@ -64,10 +64,10 @@ namespace BWP.B3_YunKen.BLActions
           }
         }
 
-        if (list.Count() > 0 && !list.Any(x => x.Item1 == customer.ID)) {
+        if (list.Count() > 0 && !list.Any(x => x.Item1 == customer.AccountCustomer_ID)) {
           var first = list.First();
           var customerDetail = new SaleCreditPolicy_Detail();
-          customerDetail.Customer_ID = customer.ID;
+          customerDetail.Customer_ID = customer.AccountCustomer_ID.Value;
           customerDetail.SaleCreditPolicy_ID = first.Item2;
           context.Session.Insert(customerDetail);
           var update = new DQUpdateDom(typeof(SaleCreditPolicy));