From e1127a69d6235fbdcd3f239d94df70705242d050 Mon Sep 17 00:00:00 2001
From: luanhui <1029149336@qq.com>
Date: Wed, 27 Dec 2017 18:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=87=8D=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs       | 11 ++++++++++-
 B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs     |  6 +++++-
 B3ClientService/Rpcs/BillRpc/SaleOutStoreRpc.cs       |  2 +-
 B3ClientService/Rpcs/RpcBO/Bill/ClientGoodsSetDto.cs  |  4 ++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs b/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs
index 347524c..23a730d 100644
--- a/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs
+++ b/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs
@@ -30,7 +30,16 @@ namespace BWP.B3ClientService.BO
 
     [LogicName("主辅换算主单位比例")]
     public Money<decimal>? Goods_MainUnitRatio { get; set; }
-    
+
+    [LogicName("标准重量")]
+    public decimal? StandardWeight { get; set; }
+
+    [LogicName("标准重量上限")]
+    public decimal? StandardWeightUp { get; set; }
+
+    [LogicName("标准重量下限")]
+    public decimal? StandardWeightLow { get; set; }
+
 
 
   }
diff --git a/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs b/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs
index 78a944e..f57dce8 100644
--- a/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs
@@ -10,7 +10,7 @@ using Forks.EnterpriseServices.JsonRpc;
 using Newtonsoft.Json;
 using TSingSoft.WebPluginFramework;
 
-namespace BWP.B3ClientService.Rpcs.BillRpc
+  namespace BWP.B3ClientService.Rpcs.BillRpc
 {
   [Rpc]
   public static class ClientGoodsSetRpc
@@ -41,6 +41,10 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
           dto.Goods_Name = setDetail.Goods_Name;
           dto.Goods_Code = setDetail.Goods_Code;
           dto.Goods_Spec = setDetail.Goods_Spec;
+
+          dto.StandardWeight = setDetail.StandardWeight;
+          dto.StandardWeightUp = setDetail.StandardWeightUp;
+          dto.StandardWeightLow = setDetail.StandardWeightLow;
           list.Add(dto);
         }
       }
diff --git a/B3ClientService/Rpcs/BillRpc/SaleOutStoreRpc.cs b/B3ClientService/Rpcs/BillRpc/SaleOutStoreRpc.cs
index a1c9398..4ea9b78 100644
--- a/B3ClientService/Rpcs/BillRpc/SaleOutStoreRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/SaleOutStoreRpc.cs
@@ -31,7 +31,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
         dmoquery.Where.Conditions.Add(DQCondition.EQ("DeliverGoodsLine_Name", sendLineName));
       }
 
-      if (!string.IsNullOrWhiteSpace(sendLineName))
+      if (!string.IsNullOrWhiteSpace(billstate))
       {
         dmoquery.Where.Conditions.Add(DQCondition.EQ("BillState", billstate));
       }
diff --git a/B3ClientService/Rpcs/RpcBO/Bill/ClientGoodsSetDto.cs b/B3ClientService/Rpcs/RpcBO/Bill/ClientGoodsSetDto.cs
index b547364..0577941 100644
--- a/B3ClientService/Rpcs/RpcBO/Bill/ClientGoodsSetDto.cs
+++ b/B3ClientService/Rpcs/RpcBO/Bill/ClientGoodsSetDto.cs
@@ -15,5 +15,9 @@ namespace BWP.B3ClientService.Rpcs.RpcBO.Bill
     public string Goods_Name { get; set; }
     public string Goods_Code { get; set; }
     public string Goods_Spec { get; set; }
+
+    public decimal? StandardWeight { get; set; }
+    public decimal? StandardWeightUp { get; set; }
+    public decimal? StandardWeightLow { get; set; }
   }
 }