From 034bc734146d2a984f83e0a735b2260ee36e274b Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Mon, 5 Feb 2018 09:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=AA=8C=E8=B4=A8=E5=88=86?=
 =?UTF-8?q?=E5=9C=88=E6=94=B9=E5=A4=B4=E6=95=B0=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=8E=92=E5=AE=B0=E9=A1=BA=E5=BA=8F=E6=B2=A1=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E4=B8=BA=E6=9C=AA=E5=90=8C=E6=AD=A5=E4=BA=A7=E7=94=9F=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs | 9 ++++-----
 B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs      | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs b/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs
index 203a33f..412c8d5 100644
--- a/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs
@@ -207,7 +207,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
       session.ExecuteNonQuery(dUpdate);
     }
 
-    static bool UpdateOrderNumber(IDmoSession session, long weightID, int newNumber, int oldNumber)
+    static bool UpdateOrderNumber(IDmoSessionWithTransaction session, long weightID, int newNumber, int oldNumber)
     {
       if (newNumber == oldNumber)
         return false;
@@ -229,10 +229,9 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
         return true;
       else if (oldNumber - unOrderNumber - order.Sum(x => x.Item2) > 0)
         return true;
-      var update = new DQUpdateDom(typeof(OrderDetail));
-      update.Where.Conditions.Add(DQCondition.EQ("ID", tags.First().Item1));
-      update.Columns.Add(new DQUpdateColumn("PlanNumber", DQExpression.Add(DQExpression.Field("PlanNumber"), DQExpression.Value(newNumber - oldNumber))));
-      session.ExecuteNonQuery(update);
+      var entity = tags.First();
+      OrderDetailRpc.UpdateOrderDetailPartial(session, entity.Item1, "PlanNumber", entity.Item2 + newNumber - oldNumber);
+      OrderDetailRpc.UpdateSecondOrder(entity.Item1, session);
       return false;
     }
 
diff --git a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
index 1334867..7b2c8f7 100644
--- a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
@@ -254,7 +254,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
         throw new Exception("不允许插入到已进行烫毛计数顺序之前");
     }
 
-    static void UpdateOrderDetailPartial(IDmoSession session, long id, string property, object value)
+    public static void UpdateOrderDetailPartial(IDmoSession session, long id, string property, object value)
     {
       var update = new DQUpdateDom(typeof(OrderDetail));
       update.Columns.Add(new DQUpdateColumn(property, value));
@@ -280,7 +280,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
       return 1;
     }
 
-    private static void UpdateSecondOrder(long id, IDmoSessionWithTransaction session)
+    public static void UpdateSecondOrder(long id, IDmoSessionWithTransaction session)
     {
       var update = new DQUpdateDom(typeof(SecondOrder));
       update.Columns.Add(new DQUpdateColumn("Sync", false));