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(method, serializer.Serialize(orderDetail),hurryOrderID); } + + public static int GetCurrentOrderPlanNumber(long orderID) + { + const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/GetCurrentOrderPlanNumber"; + return RpcFacade.Call(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) {