From e752c5a6c8e9d0d0e0a5f4d5d3535e8da34c299f Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Fri, 20 Oct 2017 20:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8D=B0=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3ClientService/BO/Bill/WeightBill/WeightBill.cs       |  2 ++
 .../ClientSerializerBo/WeightBill/WeightBillList.cs    |  2 ++
 B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs          | 10 +++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/B3ClientService/BO/Bill/WeightBill/WeightBill.cs b/B3ClientService/BO/Bill/WeightBill/WeightBill.cs
index a66159d..a50025c 100644
--- a/B3ClientService/BO/Bill/WeightBill/WeightBill.cs
+++ b/B3ClientService/BO/Bill/WeightBill/WeightBill.cs
@@ -15,6 +15,8 @@ namespace BWP.B3ClientService.BO
     public int RowVersion { get; set; }
 
     #region BasicFile
+    public int PrintNumber { get; set; }
+
     public long? AccountingUnit_ID { get; set; }
 
     public long? Department_ID { get; set; }
diff --git a/B3ClientService/ClientSerializerBo/WeightBill/WeightBillList.cs b/B3ClientService/ClientSerializerBo/WeightBill/WeightBillList.cs
index d920f62..d52148b 100644
--- a/B3ClientService/ClientSerializerBo/WeightBill/WeightBillList.cs
+++ b/B3ClientService/ClientSerializerBo/WeightBill/WeightBillList.cs
@@ -30,5 +30,7 @@ namespace BWP.B3ClientService
     public string Remark { get; set; }
 
     public bool FinishWeight { get; set; }
+
+    public int PrintNumber { get; set; }
   }
 }
diff --git a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
index ea9bcb6..5936a4f 100644
--- a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
@@ -40,6 +40,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
       query.Columns.Add(DQSelectColumn.Field("Number", detail));
       query.Columns.Add(DQSelectColumn.Field("Weight", detail));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.LogicCase(DQCondition.And(DQCondition.IsNotNull(DQExpression.Field(detail, "PiWeight")), DQCondition.IsNotNull(DQExpression.Field(detail, "MaoWeight"))), DQExpression.Value(1), DQExpression.Value(0)), "FinishWeight"));
+      query.Columns.Add(DQSelectColumn.Field("PrintNumber"));
       query.Where.Conditions.Add(DQCondition.And(DQCondition.Between("WeighTime", date, date + new TimeSpan(23, 59, 29)), DQCondition.EQ("DeleteState", false)));
       if (carID.HasValue)
         query.Where.Conditions.Add(DQCondition.EQ("Car_ID", carID));
@@ -65,6 +66,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
             entity.Number = (int?)reader[9];
             entity.Weight = (decimal?)reader[10];
             entity.FinishWeight = Convert.ToBoolean(reader[11]);
+            entity.PrintNumber = (int)reader[12];
             list.Add(entity);
           }
         }
@@ -145,13 +147,14 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
 
     static void FillServerUpdateFields(IDmoSession session, WeightBill dmo)
     {
-      var min = InnerBLUtil.GetSingleDmo<WeightBill>(session, "ID", dmo.ID, "B3ID", "DeleteState", "Inspector_ID", "Inspector_Name", "HouseNames", "SanctionMoney");
+      var min = InnerBLUtil.GetSingleDmo<WeightBill>(session, "ID", dmo.ID, "B3ID", "DeleteState", "Inspector_ID", "Inspector_Name", "HouseNames", "SanctionMoney", "PrintNumber");
       dmo.B3ID = min.B3ID;
       dmo.DeleteState = min.DeleteState;
       dmo.Inspector_ID = min.Inspector_ID;
       dmo.Inspector_Name = min.Inspector_Name;
       dmo.HouseNames = min.HouseNames;
       dmo.SanctionMoney = min.SanctionMoney;
+      dmo.PrintNumber = min.PrintNumber;
       dmo.Sync = false;
       dmo.ModifyTime = DateTime.Now;
     }
@@ -309,6 +312,11 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
     [Rpc]
     public static int DoCheck(long id, string creator)
     {
+      var update = new DQUpdateDom(typeof(WeightBill));
+      update.Where.Conditions.Add(DQCondition.EQ("ID", id));
+      update.Columns.Add(new DQUpdateColumn("PrintNumber", DQExpression.Add(DQExpression.Field("PrintNumber"), DQExpression.Value(1))));
+      update.EExecute();
+
       WeightBillCheck.Insert(id, creator);
       return 1;
     }