From 8b6a8594e631e94ebc686cd437c1f81c12d51523 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Tue, 24 Oct 2017 16:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Utils/BillRpc/OrderDetailRpc.cs         | 6 ++++++
 QualityAndOrder/QualityOrderFormForTab2.cs | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/BO/Utils/BillRpc/OrderDetailRpc.cs b/BO/Utils/BillRpc/OrderDetailRpc.cs
index 323dc6b..73ac69a 100644
--- a/BO/Utils/BillRpc/OrderDetailRpc.cs
+++ b/BO/Utils/BillRpc/OrderDetailRpc.cs
@@ -135,5 +135,11 @@ namespace BO.Utils.BillRpc
       const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/InsertByHurryRecord";
       orderDetail.ID = RpcFacade.Call<long>(method, serializer.Serialize(orderDetail),hurryOrderID);
     }
+
+    public static int GetCurrentOrderPlanNumber(long orderID)
+    {
+      const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/GetCurrentOrderPlanNumber";
+      return RpcFacade.Call<int>(method, orderID);
+    }
   }
 }
diff --git a/QualityAndOrder/QualityOrderFormForTab2.cs b/QualityAndOrder/QualityOrderFormForTab2.cs
index aeb805e..1cceb2e 100644
--- a/QualityAndOrder/QualityOrderFormForTab2.cs
+++ b/QualityAndOrder/QualityOrderFormForTab2.cs
@@ -239,7 +239,7 @@ namespace QualityAndOrder
         BindOrderGrid();
       }
       else
-        OrderDetailRpc.ChangeShowType((long)preOrderGrid.CurrentRow.Cells["P_WeightBill_ID"].Value, (bool)preOrderGrid.CurrentRow.Cells["P_Show"].Value);
+        OrderDetailRpc.ChangeShowType((long)preOrderGrid.CurrentRow.Cells["P_WeightBill_ID"].Value, !(bool)preOrderGrid.CurrentRow.Cells["P_Show"].Value);
       BindPreOrderGrid();
     }
 
@@ -282,8 +282,9 @@ namespace QualityAndOrder
       var lastNumber = OrderDetailRpc.GetLastNumber(lastOrderDetail.WeightBill_ID, lastOrderDetail.ID);
 
       if (lastOrderDetail.PlanNumber > lastNumber)
-        throw new Exception("排宰总头数多余过磅头数");
-      if (lastOrderDetail.PlanNumber == lastNumber)
+        throw new Exception("排宰总头数多于过磅头数");
+      var dbCurrentNumber = OrderDetailRpc.GetCurrentOrderPlanNumber(lastOrderDetail.ID);
+      if (lastOrderDetail.PlanNumber == dbCurrentNumber)
         return;
       if (lastOrderDetail.PlanNumber == 0)
       {