From 302a1a87956415be6f3d5470a33fa94cf00d3a39 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Thu, 19 Apr 2018 17:25:07 +0800 Subject: [PATCH] . --- B3ClientService/OfflinRpc/BaseInfoRpc.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/B3ClientService/OfflinRpc/BaseInfoRpc.cs b/B3ClientService/OfflinRpc/BaseInfoRpc.cs index bfb5c8a..93b3286 100644 --- a/B3ClientService/OfflinRpc/BaseInfoRpc.cs +++ b/B3ClientService/OfflinRpc/BaseInfoRpc.cs @@ -24,7 +24,13 @@ namespace BWP.B3ClientService.Rpcs [Rpc(RpcFlags.SkipAuth)] public static string SyncProductBatch() { - return GetBaseInfoJosn(DQCondition.EQ("IsLocked", false)); + var query = new DQueryDom(new JoinAlias(typeof(ProductBatch))); + query.Columns.Add(DQSelectColumn.Field("ID")); + query.Columns.Add(DQSelectColumn.Field("Name")); + query.Columns.Add(DQSelectColumn.Field("Date")); + query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("IsLocked", false), DQCondition.EQ("Stopped", false))); + var list = query.EExecuteList().Select(x => new MinProductBatch { ID = x.Item1, Name = x.Item2, Date = x.Item3 }); + return JsonConvert.SerializeObject(list); } static string GetBaseInfoJosn(IDQExpression withCondition = null) @@ -118,6 +124,11 @@ namespace BWP.B3ClientService.Rpcs public string Name { get; set; } } + class MinProductBatch : MinBaseInfo + { + public DateTime? Date { get; set; } + } + class MinGoods : MinBaseInfo { public string Code { get; set; }