From b9ca71b9e322bf7b23a54ce21dd1950114ecda4e Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Thu, 21 Sep 2017 19:54:38 +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/GradeAndWeightRpc.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs b/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs
index adbaf2d..d2e09e5 100644
--- a/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs
@@ -83,31 +83,35 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
         query.Where.Conditions.Add(DQCondition.EQ("Technics", type));
       if (order.HasValue)
         query.Where.Conditions.Add(DQCondition.EQ("Order", order));
-      query.OrderBy.Expressions.Add(DQOrderByExpression.Create("Time"));
+      query.OrderBy.Expressions.Add(DQOrderByExpression.Create("Index", true));
       return serializer.Serialize(query.EExecuteList());
     }
 
     [Rpc]
-    public static long InsertDetail(string json)
+    public static long InsertOrInsertDetail(string json)
     {
       json = json.ESerializeDateTime();
       var entity = serializer.Deserialize<GradeAndWeight_Detail>(json);
       using (var session = Dmo.NewSession())
       {
-        session.Insert(entity);
+        if (entity.ID == 0)
+          session.Insert(entity);
+        else
+          session.Update(entity);
         session.Commit();
         return entity.ID;
       }
     }
 
     [Rpc]
-    public static int FillWeight(long id, decimal weight)
+    public static int UpdateLivestock(long id, long liveStockID, string liveStockName)
     {
       using (var session = Dmo.NewSession())
       {
         var update = new DQUpdateDom(typeof(GradeAndWeight_Detail));
         update.Where.Conditions.Add(DQCondition.EQ("ID", id));
-        update.Columns.Add(new DQUpdateColumn("Weight", weight));
+        update.Columns.Add(new DQUpdateColumn("Livestock_ID", liveStockID));
+        update.Columns.Add(new DQUpdateColumn("Livestock_Name", liveStockName));
         session.ExecuteNonQuery(update);
         session.Commit();
       }