From 3973e75564f74ab3bc85697b8480b4e8bc52d138 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Thu, 30 Nov 2017 18:09:08 +0800
Subject: [PATCH] .

---
 .../WeightBill/PrintWeightBill.cs                  | 14 +++++++++++++-
 B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs      | 12 ++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/B3ClientService/ClientSerializerBo/WeightBill/PrintWeightBill.cs b/B3ClientService/ClientSerializerBo/WeightBill/PrintWeightBill.cs
index db5bf3d..46ccee4 100644
--- a/B3ClientService/ClientSerializerBo/WeightBill/PrintWeightBill.cs
+++ b/B3ClientService/ClientSerializerBo/WeightBill/PrintWeightBill.cs
@@ -20,12 +20,24 @@ namespace BWP.B3ClientService
 
     public string Inspector_Name { get; set; }
 
-    public string HogGrade_Name { get; set; }
+    public string HogGrade_Name { get; set; } 
+
+    public string PurchaseType_Name { get; set; }
+
+    public string Car_Name { get; set; }
 
     public decimal? Weight { get; set; }
 
     public int? Number { get; set; }
 
+    public decimal? ShackWeight { get; set; }
+
+    public decimal? ShackMoney { get; set; }
+
+    public decimal? JingJianFee { get; set; }
+
+    public decimal? DiscontMoney { get; set; }
+
     private List<PWeightBill_SanctionDetail> _details = new List<PWeightBill_SanctionDetail>();
     public List<PWeightBill_SanctionDetail> Details { get { return _details; } set { _details = value; } }
   }
diff --git a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
index dd28d69..ff9ea9d 100644
--- a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
@@ -280,6 +280,12 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
       query.Columns.Add(DQSelectColumn.Field("Number", detail));
       query.Columns.Add(DQSelectColumn.Field("B3ID"));
       query.Columns.Add(DQSelectColumn.Field("HogGrade_Name"));
+      query.Columns.Add(DQSelectColumn.Field("PurchaseType_Name"));
+      query.Columns.Add(DQSelectColumn.Field("Car_Name"));
+      query.Columns.Add(DQSelectColumn.Field("ShackWeight"));
+      query.Columns.Add(DQSelectColumn.Field("ShackMoney"));
+      query.Columns.Add(DQSelectColumn.Field("JingJianFee"));
+      query.Columns.Add(DQSelectColumn.Field("DiscontMoney"));
       query.Where.Conditions.Add(DQCondition.EQ(main, "ID", id));
       var entity = new PrintWeightBill();
       using (var session = Dmo.NewSession())
@@ -297,6 +303,12 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
             entity.Number = (int?)reader[6];
             entity.ID = (long?)reader[7];
             entity.HogGrade_Name = (string)reader[8];
+            entity.PurchaseType_Name = (string)reader[9];
+            entity.Car_Name = (string)reader[10];
+            entity.ShackWeight = (decimal?)reader[11];
+            entity.ShackMoney = (decimal?)reader[12];
+            entity.JingJianFee = (decimal?)reader[13];
+            entity.DiscontMoney = (decimal?)reader[14];
           }
         }
       }