Browse Source

修改。

master
yibo 8 years ago
parent
commit
c27c2d9670
4 changed files with 9 additions and 40 deletions
  1. +0
    -1
      B3ClientService/B3ClientService.csproj
  2. +3
    -0
      B3ClientService/BO/Bill/SecondOrder/SecondOrder.cs
  3. +6
    -1
      B3ClientService/Rpcs/BillRpc/SecondOrderRpc.cs
  4. +0
    -38
      B3ClientService/Rpcs/VersionRpc.cs

+ 0
- 1
B3ClientService/B3ClientService.csproj View File

@ -120,7 +120,6 @@
<Compile Include="Rpcs\BillRpc\GradeAndWeightRpc.cs" />
<Compile Include="Rpcs\BillRpc\WeightBillRpc.cs" />
<Compile Include="Rpcs\UserInfoRpc.cs" />
<Compile Include="Rpcs\VersionRpc.cs" />
<Compile Include="Tasks\SyncInfoFromServer.cs" />
<Compile Include="Tasks\UpdateLoad\UploadOrderDetail.cs" />
<Compile Include="Tasks\UpdateLoad\UploadSecondOrder.cs" />


+ 3
- 0
B3ClientService/BO/Bill/SecondOrder/SecondOrder.cs View File

@ -30,6 +30,9 @@ namespace BWP.B3ClientService.BO
public bool IsOk { get; set; }
[DbColumn(DefaultValue = 1)]
public bool Finish { get; set; }
public bool FinishGrade { get; set; }
}
}

+ 6
- 1
B3ClientService/Rpcs/BillRpc/SecondOrderRpc.cs View File

@ -33,6 +33,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
query.Columns.Add(DQSelectColumn.Field("PlanNumber", main));
query.Columns.Add(DQSelectColumn.Field("HotFadeNumber", detail));
query.Columns.Add(DQSelectColumn.Field("IsOk", detail));
query.Columns.Add(DQSelectColumn.Field("Finish", detail));
var list = new List<SecondOrder>();
using (var session = Dmo.NewSession())
{
@ -48,6 +49,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
item.PlanNumber = (int)reader[3];
item.HotFadeNumber = (int?)reader[4] ?? 0;
item.IsOk = (bool?)reader[5] ?? false;
item.Finish = (bool?)reader[6] ?? false;
}
}
}
@ -67,6 +69,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
mainJson = mainJson.ESerializeDateTime();
var entity = serializer.Deserialize<SecondOrder>(mainJson);
entity.ModifyTime = DateTime.Now;
entity.IsOk = true;
session.Insert(entity);
detail.SecondOrder_ID = entity.ID;
}
@ -103,7 +106,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
}
[Rpc]
public static long SetOk(long id, string json)
public static long SetFinish(long id, string json)
{
using (var session = Dmo.NewSession())
{
@ -112,6 +115,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
var entity = serializer.Deserialize<SecondOrder>(json);
entity.ModifyTime = DateTime.Now;
entity.IsOk = true;
entity.Finish = true;
session.Insert(entity);
id = entity.ID;
}
@ -122,6 +126,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
update.Columns.Add(new DQUpdateColumn("Sync", false));
update.Columns.Add(new DQUpdateColumn("ModifyTime", DateTime.Now));
update.Columns.Add(new DQUpdateColumn("IsOk", true));
update.Columns.Add(new DQUpdateColumn("Finish", true));
session.ExecuteNonQuery(update);
}
session.Commit();


+ 0
- 38
B3ClientService/Rpcs/VersionRpc.cs View File

@ -1,38 +0,0 @@
using Forks.EnterpriseServices.JsonRpc;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Web;
namespace BWP.B3ClientService.Rpcs
{
[Rpc]
public static class VersionRpc
{
[Rpc(RpcFlags.SkipAuth)]
public static string CheckVersion(string version)
{
var folder = Path.Combine(HttpRuntime.AppDomainAppPath, "ClientVersion");
var versionPath = Path.Combine(folder, "Version.txt");
if (File.Exists(versionPath))
{
if (File.ReadAllText(versionPath) == version)
return null;
else
return GetAllFiles(folder);
}
return null;
}
static string GetAllFiles(string path)
{
var list = new List<string>();
var folder = new DirectoryInfo(path);
foreach (var file in folder.GetFiles())
list.Add(file.Name);
return string.Join(",", list);
}
}
}

Loading…
Cancel
Save