yibo 7 years ago
parent
commit
97ebbcd8d7
2 changed files with 6 additions and 7 deletions
  1. +3
    -3
      B3ClientService/OfflinRpc/MiniProgramRpc.cs
  2. +3
    -4
      B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs

+ 3
- 3
B3ClientService/OfflinRpc/MiniProgramRpc.cs View File

@ -89,7 +89,7 @@ namespace BWP.B3ClientService.Rpcs
query.Columns.Add(DQSelectColumn.Field("date"));
query.Columns.Add(DQSelectColumn.Field("supplier"));
query.Columns.Add(DQSelectColumn.Field("carNum"));
query.Where.Conditions.Add(DQCondition.EQ("userID", userID));
query.Where.Conditions.Add(DQCondition.And(DQCondition.IsNull(DQExpression.Field("WeightBill_ID")), DQCondition.GreaterThanOrEqual("BillTime", DateTime.Today.AddDays(-2)), DQCondition.EQ("userID", userID)));
var list = new List<HistoryObj>();
using (var session = Dmo.NewSession())
{
@ -263,8 +263,8 @@ namespace BWP.B3ClientService.Rpcs
public string supplierIDCard { get; set; }
public string bankNum { get; set; }
public string bankNum { get; set; }
public long? zoneID { get; set; }
public string zoneName { get; set; }


+ 3
- 4
B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs View File

@ -534,7 +534,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
return id;
}
[Rpc]
[Rpc(RpcFlags.SkipAuth)]
public static string GetHurryRecord(long id)
{
var query = new DmoQuery(typeof(HurryRecord));
@ -542,7 +542,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
var entity = query.EExecuteScalar<HurryRecord>();
if (entity == null)
throw new Exception(string.Format("急宰单No.{0} 已被删除", id));
return serializer.Serialize(entity);
return JsonConvert.SerializeObject(entity);
}
[Rpc]
@ -697,8 +697,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
[Rpc(RpcFlags.SkipAuth)]
public static long InsertByHurryRecord(string insert, long hurryID)
{
insert = insert.ESerializeDateTime();
var entity = serializer.Deserialize<OrderDetail>(insert);
var entity = JsonConvert.DeserializeObject<OrderDetail>(insert);
using (var session = Dmo.NewSession())
{
CheckCanInsert(session, entity.Order, entity.Date.Value);


Loading…
Cancel
Save