From 76057a5cdee20861ecf0bd4ebdee1bdcc442921d Mon Sep 17 00:00:00 2001
From: wugang <1029149336@qq.com>
Date: Sat, 4 Nov 2017 20:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3ClientService/B3ClientService.csproj        |  2 ++
 .../ClientGoodsSet_/ClientGoodsSet_Detail.cs  |  5 +++
 .../SegmentationWeightRecord.cs               | 36 +++++++++++++++++++
 .../Rpcs/BillRpc/ClientGoodsSetRpc.cs         |  4 +--
 .../BillRpc/SegmentationWeightRecordRpc.cs    | 28 +++++++++++++++
 5 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 B3ClientService/BO/SegmentationWeightRecord_/SegmentationWeightRecord.cs
 create mode 100644 B3ClientService/Rpcs/BillRpc/SegmentationWeightRecordRpc.cs

diff --git a/B3ClientService/B3ClientService.csproj b/B3ClientService/B3ClientService.csproj
index b911877..5bea345 100644
--- a/B3ClientService/B3ClientService.csproj
+++ b/B3ClientService/B3ClientService.csproj
@@ -104,6 +104,7 @@
     <Compile Include="BO\Bill\WeightBill\WeightDetail.cs" />
     <Compile Include="BO\ClientGoodsSet_\ClientGoodsSet.cs" />
     <Compile Include="BO\ClientGoodsSet_\ClientGoodsSet_Detail.cs" />
+    <Compile Include="BO\SegmentationWeightRecord_\SegmentationWeightRecord.cs" />
     <Compile Include="BO\SyncBase.cs" />
     <Compile Include="BO\SyncBill.cs" />
     <Compile Include="BO\SyncBO\MinEmployee.cs" />
@@ -117,6 +118,7 @@
     <Compile Include="CTuple.cs" />
     <Compile Include="NamedValueTemplate.cs" />
     <Compile Include="Rpcs\BillRpc\ClientGoodsSetRpc.cs" />
+    <Compile Include="Rpcs\BillRpc\SegmentationWeightRecordRpc.cs" />
     <Compile Include="Rpcs\RpcBO\Bill\ClientGoodsSetDto.cs" />
     <Compile Include="Rpcs\RpcBO\Bill\GradeAndWeight\GradeAndWeight.cs" />
     <Compile Include="Rpcs\RpcBO\Bill\OrderDetail\NeedOrderEntity.cs" />
diff --git a/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs b/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs
index 5515f22..347524c 100644
--- a/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs
+++ b/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs
@@ -5,6 +5,7 @@ using System.Text;
 using BWP.B3Frameworks.BO;
 using Forks.EnterpriseServices;
 using Forks.EnterpriseServices.DomainObjects2;
+using Forks.Utils;
 
 namespace BWP.B3ClientService.BO
 {
@@ -27,6 +28,10 @@ namespace BWP.B3ClientService.BO
 
     public string Goods_Spell { get; set; }
 
+    [LogicName("主辅换算主单位比例")]
+    public Money<decimal>? Goods_MainUnitRatio { get; set; }
+    
+
 
   }
 
diff --git a/B3ClientService/BO/SegmentationWeightRecord_/SegmentationWeightRecord.cs b/B3ClientService/BO/SegmentationWeightRecord_/SegmentationWeightRecord.cs
new file mode 100644
index 0000000..c2aaaa1
--- /dev/null
+++ b/B3ClientService/BO/SegmentationWeightRecord_/SegmentationWeightRecord.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using BWP.B3Frameworks.BO;
+using Forks.EnterpriseServices.DomainObjects2;
+
+namespace BWP.B3ClientService.BO
+{
+
+  [Serializable]
+  public class SegmentationWeightRecord:Base
+  {
+    private DateTime mCreateTime=DateTime.Now;
+
+    [DbColumn(DbType = SqlDbType.DateTime)]
+    public DateTime CreateTime { get { return mCreateTime; }set { mCreateTime = value; } }
+
+    public string BarCode { get; set; }//条码
+
+    public long Goods_ID { get; set; }
+
+    public string Goods_Name { get; set; }
+
+    public decimal PiWeight { get; set; }//皮重
+
+    public decimal MaoWeight { get; set; }//毛重
+
+    public decimal JingWeight { get; set; }//净重
+
+    public string CardBarCode { get; set; }//放产品的车的条码
+
+    public string BiaoShi { get; set; }//用来记录那个工作台或者哪台触摸屏做的
+  }
+}
diff --git a/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs b/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs
index d31fe56..c01d466 100644
--- a/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc.cs
@@ -25,10 +25,10 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
       var clist = query.EExecuteList().Cast<ClientGoodsSet>().ToList();
       foreach (ClientGoodsSet set in clist)
       {
-        var dto=new ClientGoodsSetDto();
-        dto.Name = set.Name;
         foreach (ClientGoodsSet_Detail setDetail in set.Details)
         {
+          var dto = new ClientGoodsSetDto();
+          dto.Name = set.Name;
           dto.Goods_ID = setDetail.Goods_ID;
           dto.Goods_Name = setDetail.Goods_Name;
           dto.Goods_Code = setDetail.Goods_Code;
diff --git a/B3ClientService/Rpcs/BillRpc/SegmentationWeightRecordRpc.cs b/B3ClientService/Rpcs/BillRpc/SegmentationWeightRecordRpc.cs
new file mode 100644
index 0000000..10550a5
--- /dev/null
+++ b/B3ClientService/Rpcs/BillRpc/SegmentationWeightRecordRpc.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3ClientService.BO;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.JsonRpc;
+using Newtonsoft.Json;
+
+namespace BWP.B3ClientService.Rpcs.BillRpc
+{
+  [Rpc]
+  public static class SegmentationWeightRecordRpc
+  {
+    [Rpc]
+    public static long Insert(string json)
+    {
+      var record = JsonConvert.DeserializeObject<SegmentationWeightRecord>(json);
+      record.CreateTime=DateTime.Now;
+      using (var session=Dmo.NewSession())
+      {
+        session.Insert(record);
+        session.Commit();
+      }
+      return record.ID;
+    }
+  }
+}