From 39c2df158a5bec20fc9e22ab795b7984286f4e65 Mon Sep 17 00:00:00 2001
From: luanhui <1029149336@qq.com>
Date: Fri, 29 Dec 2017 09:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E6=9D=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrunksIousOutInStoreRecord.cs                      |  7 +++++++
 .../TrunksIousOutInStoreRecordRpc.cs                   | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/B3ClientService/BO/TrunksIousOutInStoreRecord_/TrunksIousOutInStoreRecord.cs b/B3ClientService/BO/TrunksIousOutInStoreRecord_/TrunksIousOutInStoreRecord.cs
index 7a5bd48..276ef53 100644
--- a/B3ClientService/BO/TrunksIousOutInStoreRecord_/TrunksIousOutInStoreRecord.cs
+++ b/B3ClientService/BO/TrunksIousOutInStoreRecord_/TrunksIousOutInStoreRecord.cs
@@ -28,5 +28,12 @@ namespace BWP.B3ClientService.BO
     public bool? IsSubmited { get; set; }//界面有2个状态 待提交  已提交 ， 有条码有重量为已提交
 
     public decimal? LossWeight{ get; set; }//损耗
+
+
+    public string BiaoShi { get; set; }//用来记录那个工作台或者哪台触摸屏做的
+
+    public string Store { get; set; }
+
+
   }
 }
diff --git a/B3ClientService/Rpcs/BillRpc/TrunksIousOutInStoreRecord_/TrunksIousOutInStoreRecordRpc.cs b/B3ClientService/Rpcs/BillRpc/TrunksIousOutInStoreRecord_/TrunksIousOutInStoreRecordRpc.cs
index 7959633..0816499 100644
--- a/B3ClientService/Rpcs/BillRpc/TrunksIousOutInStoreRecord_/TrunksIousOutInStoreRecordRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/TrunksIousOutInStoreRecord_/TrunksIousOutInStoreRecordRpc.cs
@@ -44,11 +44,19 @@ namespace BWP.B3ClientService.Rpcs.BillRpc.TrunksIousOutInStoreRecord_
     }
 
     [Rpc]
-    public static long SetWeight(long id,decimal weight)
+    public static long SetWeight(long id,decimal weight,string biaoshi,string store)
     {
       var query = new DQUpdateDom(typeof(TrunksIousOutInStoreRecord));
       query.Columns.Add(new DQUpdateColumn("Weight", weight));
       query.Columns.Add(new DQUpdateColumn("IsSubmited", true));
+      if (!string.IsNullOrWhiteSpace(biaoshi))
+      {
+        query.Columns.Add(new DQUpdateColumn("BiaoShi", biaoshi));
+      }
+      if (!string.IsNullOrWhiteSpace(store))
+      {
+        query.Columns.Add(new DQUpdateColumn("Store", store));
+      }
 //      query.Columns.Add(new DQUpdateColumn("LossWeight", ));
 //todo 这里要算损耗
       query.Where.Conditions.Add(DQCondition.EQ("ID", id));