From d2419d83aa740e63cc3cc730c4f7e2a57777a170 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Tue, 24 Oct 2017 16:44:04 +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

---
 B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
index 1f5a00b..7c4185c 100644
--- a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
@@ -150,7 +150,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
     {
       var query = new DQueryDom(new JoinAlias(typeof(HurryRecord)));
       query.Columns.Add(DQSelectColumn.Sum("HurryNumber"));
-      query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field("ToOrderDetail_ID")));
+      query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("WeightBill_ID", wid), DQCondition.IsNull(DQExpression.Field("ToOrderDetail_ID"))));
       var rst = query.EExecuteScalar();
       if (rst != null)
         return Convert.ToInt32(rst);
@@ -210,11 +210,22 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
 
     [Rpc]
     public static int GetCurrentOrder(long id)
+    {
+      return GetOrderDetailProperty<int>(id, "Order");
+    }
+
+    [Rpc]
+    public static int GetCurrentOrderPlanNumber(long id)
+    {
+      return GetOrderDetailProperty<int>(id, "PlanNumber");
+    }
+
+    static T GetOrderDetailProperty<T>(long id,string property)
     {
       var query = new DQueryDom(new JoinAlias(typeof(OrderDetail)));
-      query.Columns.Add(DQSelectColumn.Field("Order"));
+      query.Columns.Add(DQSelectColumn.Field(property));
       query.Where.Conditions.Add(DQCondition.EQ("ID", id));
-      return query.EExecuteScalar<int>();
+      return (T)query.EExecuteScalar();
     }
 
     [Rpc]