From 8086e98f03d6ab4cafdf362473cc1155549807b2 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Thu, 19 Oct 2017 21:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E4=B8=8A=E4=BC=A0=E5=88=B0B3=20?=
 =?UTF-8?q?=E4=B9=9F=E6=94=AF=E6=8C=81=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8D=95=E6=8D=AE=EF=BC=8C=E7=9B=B8=E5=BA=94=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=AE=A1=E6=A0=B8=E8=AE=B0=E5=BD=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BO/Bill/WeightBill/WeightBillCheck.cs          | 14 +++++++++-----
 B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs      |  8 ++++++--
 B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs   |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs b/B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs
index 94d1ee3..86c4909 100644
--- a/B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs
+++ b/B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs
@@ -12,7 +12,11 @@ namespace BWP.B3ClientService.BO
   [BOClass]
   public class WeightBillCheck
   {
-    public long B3ID { get; set; }
+    public long ID { get; set; }
+
+    [ReferenceTo(typeof(WeightBill), "B3ID")]
+    [Join("ID", "ID")]
+    public long? B3ID { get; set; }
 
     /// <summary>
     /// 单据创建人用户名
@@ -31,7 +35,7 @@ namespace BWP.B3ClientService.BO
       if (Exist(id))
         return;
       var entity = new WeightBillCheck();
-      entity.B3ID = id;
+      entity.ID = id;
       entity.Creator = creator;
       entity.ModifyTime = DateTime.Now;
       using (var session = Dmo.NewSession())
@@ -44,15 +48,15 @@ namespace BWP.B3ClientService.BO
     static bool Exist(long id)
     {
       var query = new DQueryDom(new JoinAlias(typeof(WeightBillCheck)));
-      query.Where.Conditions.Add(DQCondition.EQ("B3ID", id));
+      query.Where.Conditions.Add(DQCondition.EQ("ID", id));
       return query.EExists();
     }
 
-    public static void SetSynced(long id)
+    public static void SetSynced(long b3ID)
     {
       var update = new DQUpdateDom(typeof(WeightBillCheck));
       update.Columns.Add(new DQUpdateColumn("Sync", true));
-      update.Where.Conditions.Add(DQCondition.EQ("B3ID", id));
+      update.Where.Conditions.Add(DQCondition.EQ("B3ID", b3ID));
       update.EExecute();
     }
   }
diff --git a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
index 82b2d97..ea9bcb6 100644
--- a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
@@ -226,6 +226,10 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
         update.Columns.Add(new DQUpdateColumn("Sync", false));
         update.Where.Conditions.Add(DQCondition.EQ("ID", id));
         session.ExecuteNonQuery(update);
+
+        var delete = new DQDeleteDom(typeof(WeightBillCheck));
+        delete.Where.Conditions.Add(DQCondition.EQ("ID", id));
+        session.ExecuteNonQuery(delete);
         session.Commit();
       }
 
@@ -303,9 +307,9 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
     }
 
     [Rpc]
-    public static int DoCheck(long b3ID, string creator)
+    public static int DoCheck(long id, string creator)
     {
-      WeightBillCheck.Insert(b3ID, creator);
+      WeightBillCheck.Insert(id, creator);
       return 1;
     }
   }
diff --git a/B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs b/B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs
index 78857ba..77080d1 100644
--- a/B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs
+++ b/B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs
@@ -28,7 +28,7 @@ namespace BWP.B3ClientService.Tasks.UpdateLoad
       var query = new DQueryDom(new JoinAlias(typeof(WeightBillCheck)));
       query.Columns.Add(DQSelectColumn.Field("B3ID"));
       query.Columns.Add(DQSelectColumn.Field("Creator"));
-      query.Where.Conditions.Add(DQCondition.EQ("Sync", false));
+      query.Where.Conditions.Add(DQCondition.And(DQCondition.IsNotNull(DQExpression.Field("B3ID")), DQCondition.EQ("Sync", false)));
       return query.EExecuteList<long, string>();
     }
   }