From 76b29cb8eaaac56206561ef6791a5cc25ab527b0 Mon Sep 17 00:00:00 2001
From: wugang <1029149336@qq.com>
Date: Mon, 11 Dec 2017 15:51:25 +0800
Subject: [PATCH] 1

---
 B3ClientService/B3ClientService.csproj        |  2 ++
 .../BO/ProductTask_/ProductTask.cs            | 23 ++++++++++++++++
 B3ClientService/Rpcs/BaseInfoRpc.cs           | 14 +++++-----
 .../Rpcs/BillRpc/ProductTaskRpc.cs            | 26 +++++++++++++++++++
 B3ClientService/Tasks/SyncBillFromServer.cs   | 18 +++++++++++++
 5 files changed, 76 insertions(+), 7 deletions(-)
 create mode 100644 B3ClientService/BO/ProductTask_/ProductTask.cs
 create mode 100644 B3ClientService/Rpcs/BillRpc/ProductTaskRpc.cs

diff --git a/B3ClientService/B3ClientService.csproj b/B3ClientService/B3ClientService.csproj
index 1828194..123adc6 100644
--- a/B3ClientService/B3ClientService.csproj
+++ b/B3ClientService/B3ClientService.csproj
@@ -114,6 +114,7 @@
     <Compile Include="BO\ClientGoodsSet_\ClientGoodsSet_Detail.cs" />
     <Compile Include="BO\ClientSyncBase.cs" />
     <Compile Include="BO\ClientSyncBaseDto.cs" />
+    <Compile Include="BO\ProductTask_\ProductTask.cs" />
     <Compile Include="BO\SegmentationByPproductTrace_\SegmentationByPproductTrace.cs" />
     <Compile Include="BO\SegmentationInStoreRecord_\SegmentationInStoreRecord.cs" />
     <Compile Include="BO\SegmentationWeightRecord_\SegmentationWeightRecord.cs" />
@@ -135,6 +136,7 @@
     <Compile Include="Rpcs\BillRpc\ByProductWeightRecordRpc.cs" />
     <Compile Include="Rpcs\BillRpc\ClientGoodsSetRpc.cs" />
     <Compile Include="Rpcs\BillRpc\DropPigRpc.cs" />
+    <Compile Include="Rpcs\BillRpc\ProductTaskRpc.cs" />
     <Compile Include="Rpcs\BillRpc\SaleOutStoreRpc.cs" />
     <Compile Include="Rpcs\BillRpc\SegmentationInStoreRecordRpc.cs" />
     <Compile Include="Rpcs\BillRpc\SegmentationWeightRecordRpc.cs" />
diff --git a/B3ClientService/BO/ProductTask_/ProductTask.cs b/B3ClientService/BO/ProductTask_/ProductTask.cs
new file mode 100644
index 0000000..7d81807
--- /dev/null
+++ b/B3ClientService/BO/ProductTask_/ProductTask.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3Frameworks.BO;
+using Forks.EnterpriseServices.DataForm;
+using Forks.EnterpriseServices.DomainObjects2;
+using TSingSoft.WebPluginFramework;
+
+namespace BWP.B3ClientService.BO
+{
+  [KeyField("ID", KeyGenType.identity)]
+  [Serializable, BOClass, DFClass]
+  public class ProductTask
+  {
+    public long ID { get; set; }
+    public string ProductBatch { get; set; }
+    public long Goods_ID { get; set; }
+    public string Goods_Name { get; set; }
+    public decimal Number { get; set; }
+    public decimal SecondNumber { get; set; }
+  }
+}
diff --git a/B3ClientService/Rpcs/BaseInfoRpc.cs b/B3ClientService/Rpcs/BaseInfoRpc.cs
index ff007c2..d897837 100644
--- a/B3ClientService/Rpcs/BaseInfoRpc.cs
+++ b/B3ClientService/Rpcs/BaseInfoRpc.cs
@@ -22,9 +22,11 @@ namespace BWP.B3ClientService.Rpcs
 
 
     [Rpc]
-    public static List<WordPair> GetWorkShopList(string input, string args, int top)
+    public static string GetWorkShopList()
     {
-      return GetBaseInfoList<WorkShop>(input, args, top);
+      var query = new DmoQuery(typeof(WorkShop));
+      var list = query.EExecuteList().Cast<WorkShop>().ToList();
+      return JsonConvert.SerializeObject(list);
     }
 
     [Rpc]
@@ -36,13 +38,11 @@ namespace BWP.B3ClientService.Rpcs
     }
 
     [Rpc]
-    public static string GetProductBatchList(string input)
+    public static string GetProductBatchList()
     {
+      //只查询5天前的批次
       var query = new DmoQuery(typeof(ProductBatch));
-      if (!string.IsNullOrEmpty(input))
-      {
-        query.Where.Conditions.Add(DQCondition.Like("Name", input));
-      }
+      query.Range=SelectRange.Top(5);
       var list = query.EExecuteList().Cast<ProductBatch>().ToList();
       return JsonConvert.SerializeObject(list);
     }
diff --git a/B3ClientService/Rpcs/BillRpc/ProductTaskRpc.cs b/B3ClientService/Rpcs/BillRpc/ProductTaskRpc.cs
new file mode 100644
index 0000000..38d6c21
--- /dev/null
+++ b/B3ClientService/Rpcs/BillRpc/ProductTaskRpc.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3ClientService.BO;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.EnterpriseServices.JsonRpc;
+using Newtonsoft.Json;
+using TSingSoft.WebPluginFramework;
+
+namespace BWP.B3ClientService.Rpcs.BillRpc
+{
+  [Rpc]
+  public static  class ProductTaskRpc
+  {
+    [Rpc]
+    public static string GetListByBatch(string batch)
+    {
+      var query=new DmoQuery(typeof(ProductTask));
+      query.Where.Conditions.Add(DQCondition.EQ("ProductBatch",batch));
+      var list = query.EExecuteList().Cast<ProductTask>().ToList();
+      return JsonConvert.SerializeObject(list);
+    }
+  }
+}
diff --git a/B3ClientService/Tasks/SyncBillFromServer.cs b/B3ClientService/Tasks/SyncBillFromServer.cs
index c34214e..8ad9abc 100644
--- a/B3ClientService/Tasks/SyncBillFromServer.cs
+++ b/B3ClientService/Tasks/SyncBillFromServer.cs
@@ -31,11 +31,29 @@ namespace BWP.B3ClientService.Tasks
         }
 
         SyncSaleOutStore();
+        SyncProductTask();
 
 
       }
     }
 
+    private void SyncProductTask()
+    {
+      var json = RpcFacade.Call<string>("/MainSystem/B3ButcherManage/Rpcs/TouchScreenRpcs/SyncProductTask");
+      var list = JsonConvert.DeserializeObject<List<ProductTask>>(json);
+
+      using (var context = new TransactionContext())
+      {
+        var sql1 = @"truncate table [B3ClientService_ProductTask];";
+        context.Session.ExecuteSqlNonQuery(sql1);
+        foreach (ProductTask dmo in list)
+        {
+          context.Session.Insert(dmo);
+        }
+        context.Commit();
+      }
+    }
+
     private void SyncSaleOutStore()
     {
       //只更新一个星期的