Browse Source

修改。

master
yibo 8 years ago
parent
commit
666fbf375b
4 changed files with 37 additions and 4 deletions
  1. +1
    -0
      B3ClientService/B3ClientService.csproj
  2. +1
    -1
      B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs
  3. +5
    -3
      B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
  4. +30
    -0
      B3ClientService/Tasks/UpdateLoad/UploadSecondOrder.cs

+ 1
- 0
B3ClientService/B3ClientService.csproj View File

@ -110,6 +110,7 @@
<Compile Include="Rpcs\UserInfoRpc.cs" /> <Compile Include="Rpcs\UserInfoRpc.cs" />
<Compile Include="Tasks\SyncInfoFromServer.cs" /> <Compile Include="Tasks\SyncInfoFromServer.cs" />
<Compile Include="Tasks\UpdateLoad\UploadOrderDetail.cs" /> <Compile Include="Tasks\UpdateLoad\UploadOrderDetail.cs" />
<Compile Include="Tasks\UpdateLoad\UploadSecondOrder.cs" />
<Compile Include="Tasks\UpdateLoad\UploadTest.cs" /> <Compile Include="Tasks\UpdateLoad\UploadTest.cs" />
<Compile Include="Tasks\UpdateLoad\UpLoadWeightBill.cs" /> <Compile Include="Tasks\UpdateLoad\UpLoadWeightBill.cs" />
<Compile Include="WordPair.cs" /> <Compile Include="WordPair.cs" />


+ 1
- 1
B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs View File

@ -19,7 +19,7 @@ namespace BWP.B3ClientService.BO
public long WeightBill_ID { get; set; } public long WeightBill_ID { get; set; }
[ReferenceTo(typeof(WeightBill), "B3ID")] [ReferenceTo(typeof(WeightBill), "B3ID")]
[Join("WeighBill_ID", "ID")]
[Join("WeightBill_ID", "ID")]
public long? B3WeighBill_ID { get; set; } public long? B3WeighBill_ID { get; set; }
public int Order { get; set; } public int Order { get; set; }


+ 5
- 3
B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs View File

@ -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.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("ID"));
query.Columns.Add(DQSelectColumn.Field("B3ID")); 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("Supplier_Name"));
query.Columns.Add(DQSelectColumn.Field("AlreadyHouse")); 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>(); var list = new List<WeightWithHouseDetail>();
foreach (var item in result) foreach (var item in result)
{ {
@ -169,8 +170,9 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
list.Add(bill); list.Add(bill);
entity.ID = item.Item1; entity.ID = item.Item1;
entity.B3ID = item.Item2; 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); entity.FirstWeightNumber = GetWeightDetailFirstNumber(entity.ID);
} }
var details = GetWeightHouseDetail(list.Select(x => x.Bill.ID)); var details = GetWeightHouseDetail(list.Select(x => x.Bill.ID));


+ 30
- 0
B3ClientService/Tasks/UpdateLoad/UploadSecondOrder.cs View File

@ -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;
}
}
}

Loading…
Cancel
Save