From 666fbf375b1b41adddb0ae01ef25bfc11b5c2c47 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Mon, 18 Sep 2017 08:45:01 +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/B3ClientService.csproj        |  1 +
 .../BO/Bill/OrderDetail/OrderDetail.cs        |  2 +-
 B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs |  8 +++--
 .../Tasks/UpdateLoad/UploadSecondOrder.cs     | 30 +++++++++++++++++++
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 B3ClientService/Tasks/UpdateLoad/UploadSecondOrder.cs

diff --git a/B3ClientService/B3ClientService.csproj b/B3ClientService/B3ClientService.csproj
index 91e7475..422edbc 100644
--- a/B3ClientService/B3ClientService.csproj
+++ b/B3ClientService/B3ClientService.csproj
@@ -110,6 +110,7 @@
     <Compile Include="Rpcs\UserInfoRpc.cs" />
     <Compile Include="Tasks\SyncInfoFromServer.cs" />
     <Compile Include="Tasks\UpdateLoad\UploadOrderDetail.cs" />
+    <Compile Include="Tasks\UpdateLoad\UploadSecondOrder.cs" />
     <Compile Include="Tasks\UpdateLoad\UploadTest.cs" />
     <Compile Include="Tasks\UpdateLoad\UpLoadWeightBill.cs" />
     <Compile Include="WordPair.cs" />
diff --git a/B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs b/B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs
index 425185e..5b27843 100644
--- a/B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs
+++ b/B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs
@@ -19,7 +19,7 @@ namespace BWP.B3ClientService.BO
     public long WeightBill_ID { get; set; }
 
     [ReferenceTo(typeof(WeightBill), "B3ID")]
-    [Join("WeighBill_ID", "ID")]
+    [Join("WeightBill_ID", "ID")]
     public long? B3WeighBill_ID { get; set; }
 
     public int Order { get; set; }
diff --git a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
index 14c2859..c3a9f6a 100644
--- a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
@@ -157,9 +157,10 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
       query.Where.Conditions.Add(DQCondition.And(DQCondition.And(DQCondition.EQ("DeleteState", false), DQCondition.Between("WeighTime", date.Date, date.Date + new TimeSpan(23, 59, 29)))));
       query.Columns.Add(DQSelectColumn.Field("ID"));
       query.Columns.Add(DQSelectColumn.Field("B3ID"));
+      query.Columns.Add(DQSelectColumn.Field("Employee_Name"));
       query.Columns.Add(DQSelectColumn.Field("Supplier_Name"));
       query.Columns.Add(DQSelectColumn.Field("AlreadyHouse"));
-      var result = query.EExecuteList<long, long?, string, bool>();
+      var result = query.EExecuteList<long, long?, string, string, bool>();
       var list = new List<WeightWithHouseDetail>();
       foreach (var item in result)
       {
@@ -169,8 +170,9 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
         list.Add(bill);
         entity.ID = item.Item1;
         entity.B3ID = item.Item2;
-        entity.Supplier_Name = item.Item3;
-        entity.AlreadyHouse = item.Item4;
+        entity.Employee_Name = item.Item3;
+        entity.Supplier_Name = item.Item4;
+        entity.AlreadyHouse = item.Item5;
         entity.FirstWeightNumber = GetWeightDetailFirstNumber(entity.ID);
       }
       var details = GetWeightHouseDetail(list.Select(x => x.Bill.ID));
diff --git a/B3ClientService/Tasks/UpdateLoad/UploadSecondOrder.cs b/B3ClientService/Tasks/UpdateLoad/UploadSecondOrder.cs
new file mode 100644
index 0000000..c2784db
--- /dev/null
+++ b/B3ClientService/Tasks/UpdateLoad/UploadSecondOrder.cs
@@ -0,0 +1,30 @@
+using BWP.B3ClientService.BO;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Script.Serialization;
+
+namespace BWP.B3ClientService.Tasks.UpdateLoad
+{
+  public static class UploadSecondOrder
+  {
+    public static void Execute(string uri)
+    {
+      var serializer = new JavaScriptSerializer();
+      //获取所有未上传的数据
+      var allBill = GetAllNeedSyncBill();
+    }
+
+    private static List<Tuple<long, int>> GetAllNeedSyncBill()
+    {
+      var query = new DQueryDom(new JoinAlias(typeof(SecondOrder)));
+      query.Columns.Add(DQSelectColumn.Field("OrderDetail_ID"));
+      query.Columns.Add(DQSelectColumn.Field(""));
+      return null;
+    }
+  }
+}