From 0784f1fef67413233a60aa049a4f159d252e460b Mon Sep 17 00:00:00 2001
From: wugang <1029149336@qq.com>
Date: Mon, 6 Nov 2017 13:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3ClientService/BO/BaseInfo/Livestock.cs    |  3 +++
 B3ClientService/CTuple.cs                   | 22 +++++++++++++++++++++
 B3ClientService/Rpcs/BaseInfoRpc.cs         |  3 ++-
 B3ClientService/Tasks/SyncInfoFromServer.cs |  3 ++-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/B3ClientService/BO/BaseInfo/Livestock.cs b/B3ClientService/BO/BaseInfo/Livestock.cs
index 46f14ae..e173e59 100644
--- a/B3ClientService/BO/BaseInfo/Livestock.cs
+++ b/B3ClientService/BO/BaseInfo/Livestock.cs
@@ -19,5 +19,8 @@ namespace BWP.B3ClientService.BO
     public short Technics { get; set; }
 
     public int? SortNum { get; set; }
+
+    public string Shortcut { get; set; }
+
   }
 }
diff --git a/B3ClientService/CTuple.cs b/B3ClientService/CTuple.cs
index cb2ec88..8b78bc5 100644
--- a/B3ClientService/CTuple.cs
+++ b/B3ClientService/CTuple.cs
@@ -59,4 +59,26 @@ namespace BWP.B3ClientService
       Item4 = t4;
     }
   }
+
+  public class CTuple<T1, T2, T3, T4, T5>
+  {
+    public T1 Item1 { get; set; }
+
+    public T2 Item2 { get; set; }
+
+    public T3 Item3 { get; set; }
+    public T4 Item4 { get; set; }
+    public T5 Item5 { get; set; }
+    public CTuple()
+    { }
+
+    public CTuple(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
+    {
+      Item1 = t1;
+      Item2 = t2;
+      Item3 = t3;
+      Item4 = t4;
+      Item5 = t5;
+    }
+  }
 }
diff --git a/B3ClientService/Rpcs/BaseInfoRpc.cs b/B3ClientService/Rpcs/BaseInfoRpc.cs
index a8c1b22..84f71dd 100644
--- a/B3ClientService/Rpcs/BaseInfoRpc.cs
+++ b/B3ClientService/Rpcs/BaseInfoRpc.cs
@@ -146,8 +146,9 @@ namespace BWP.B3ClientService.Rpcs
       query.Columns.Add(DQSelectColumn.Field("ID"));
       query.Columns.Add(DQSelectColumn.Field("Name"));
       query.Columns.Add(DQSelectColumn.Field("Technics"));
+      query.Columns.Add(DQSelectColumn.Field("Shortcut"));
       query.OrderBy.Expressions.Add(DQOrderByExpression.Create("SortNum", false));
-      var list = query.EExecuteList<long, string, short>().Select(x => new CTuple<long, string, short>(x.Item1, x.Item2, x.Item3)).ToList();
+      var list = query.EExecuteList<long, string, short,string>().Select(x => new CTuple<long, string, short,string>(x.Item1, x.Item2, x.Item3,x.Item4)).ToList();
       return serializer.Serialize(list);
     }
 
diff --git a/B3ClientService/Tasks/SyncInfoFromServer.cs b/B3ClientService/Tasks/SyncInfoFromServer.cs
index b1302c0..73540f5 100644
--- a/B3ClientService/Tasks/SyncInfoFromServer.cs
+++ b/B3ClientService/Tasks/SyncInfoFromServer.cs
@@ -178,7 +178,7 @@ namespace BWP.B3ClientService.Tasks
     void SyncLivestock()
     {
       var result = RpcFacade.Call<string>("/MainSystem/B3ButcherManage/Rpcs/TouchScreenRpcs/GetLivestock");
-      var list = serializer.Deserialize<List<CTuple<long, string, short, int?>>>(result);
+      var list = serializer.Deserialize<List<CTuple<long, string, short, int?,string>>>(result);
       using (var context = new TransactionContext())
       {
         var sql1 = @"truncate table [B3ClientService_Livestock];";
@@ -190,6 +190,7 @@ namespace BWP.B3ClientService.Tasks
           entity.Name = item.Item2;
           entity.Technics = item.Item3;
           entity.SortNum = item.Item4;
+          entity.Shortcut = item.Item5;
           context.Session.Insert(entity);
         }
         context.Commit();