diff --git a/B3ClientService/OfflinRpc/MiniProgramRpc.cs b/B3ClientService/OfflinRpc/MiniProgramRpc.cs index aa6b2bd..0e043ea 100644 --- a/B3ClientService/OfflinRpc/MiniProgramRpc.cs +++ b/B3ClientService/OfflinRpc/MiniProgramRpc.cs @@ -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(); 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; } diff --git a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs index c8fb1a9..b3d8a28 100644 --- a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs @@ -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(); 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(insert); + var entity = JsonConvert.DeserializeObject(insert); using (var session = Dmo.NewSession()) { CheckCanInsert(session, entity.Order, entity.Date.Value);