From eebad9334b33b6743b6e3309bddcb8ebf7960162 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Sat, 16 Sep 2017 08:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs | 11 +++++------
 B3ClientService/Tasks/UpdateLoad/UploadTest.cs        |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs b/B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs
index 77947cc..fcecf61 100644
--- a/B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs
+++ b/B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs
@@ -70,11 +70,11 @@ namespace BWP.B3ClientService.Tasks.UpdateLoad
         }
       }
     }
-
-    private static void ClearDetails(List<long> b3IDs, IDmoSession session)
+    static void DeleteUnSyncDeleteData(IDmoSession session)
     {
       var delete = new DQDeleteDom(typeof(OrderDetail));
-      delete.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("B3ID"), b3IDs.Select(x => DQExpression.Value(x)).ToArray()));
+      delete.Where.Conditions.Add(DQCondition.And(DQCondition.IsNull(DQExpression.Field("B3ID")), DQCondition.EQ("DeleteState", true)));
+      session.ExecuteNonQuery(delete);
     }
 
     private static IEnumerable<OrderDetail> GetAllNeedSyncBill()
@@ -84,11 +84,10 @@ namespace BWP.B3ClientService.Tasks.UpdateLoad
       return query.EExecuteList().Cast<OrderDetail>();
     }
 
-    static void DeleteUnSyncDeleteData(IDmoSession session)
+    private static void ClearDetails(List<long> b3IDs, IDmoSession session)
     {
       var delete = new DQDeleteDom(typeof(OrderDetail));
-      delete.Where.Conditions.Add(DQCondition.And(DQCondition.IsNull(DQExpression.Field("B3ID")), DQCondition.EQ("DeleteState", true)));
-      session.ExecuteNonQuery(delete);
+      delete.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("B3ID"), b3IDs.Select(x => DQExpression.Value(x)).ToArray()));
     }
 
     static void Update(CTuple<long, long, long> item, IDmoSession session)
diff --git a/B3ClientService/Tasks/UpdateLoad/UploadTest.cs b/B3ClientService/Tasks/UpdateLoad/UploadTest.cs
index a61cbdd..82cf524 100644
--- a/B3ClientService/Tasks/UpdateLoad/UploadTest.cs
+++ b/B3ClientService/Tasks/UpdateLoad/UploadTest.cs
@@ -23,6 +23,7 @@ namespace BWP.B3ClientService.Tasks
       if (string.IsNullOrEmpty(serverUri))
         throw new Exception("请配置服务器地址");
       UpLoadWeightBill.Execute(serverUri);
+      UploadOrderDetail.Execute(serverUri);
     }
 
     public string Name