From abb0925cb0bff397dc88081255e0a5a061775aa9 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Sat, 12 May 2018 15:32:52 +0800 Subject: [PATCH] bug. --- B3ClientService/BO/Bill/CarcassInventory/CarcassInventory.cs | 1 + B3ClientService/OfflinRpc/CarcassInventoryRpc.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/B3ClientService/BO/Bill/CarcassInventory/CarcassInventory.cs b/B3ClientService/BO/Bill/CarcassInventory/CarcassInventory.cs index 0945a16..c14769a 100644 --- a/B3ClientService/BO/Bill/CarcassInventory/CarcassInventory.cs +++ b/B3ClientService/BO/Bill/CarcassInventory/CarcassInventory.cs @@ -19,6 +19,7 @@ namespace BWP.B3ClientService.BO [LogicName("生产批次")] [DFExtProperty("WebControlType", DFEditControl.ChoiceBox)] + [DFDataKind(B3ClientServiceConsts.DataSources.生产批次)] [DFExtProperty(B3FrameworksConsts.DFExtProperties.QueryDataKind, B3ClientServiceConsts.DataSources.生产批次)] public long? ProductBatch_ID { get; set; } diff --git a/B3ClientService/OfflinRpc/CarcassInventoryRpc.cs b/B3ClientService/OfflinRpc/CarcassInventoryRpc.cs index 3d9f0f3..d421fa7 100644 --- a/B3ClientService/OfflinRpc/CarcassInventoryRpc.cs +++ b/B3ClientService/OfflinRpc/CarcassInventoryRpc.cs @@ -99,7 +99,7 @@ namespace BWP.B3ClientService.Rpcs var weightCol = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ("InStore", true), DQExpression.Field("Weight"), DQExpression.Multiply(DQExpression.Value(-1), DQExpression.Field("Weight")))); var query = new DQueryDom(new JoinAlias(typeof(CarcassFullInfoView))); - query.Where.Conditions.Add(DQCondition.And(DQCondition.LessThanOrEqual("Date", dmo.Date), DQCondition.EQ("ProductBatch_ID", dmo.ProductBatch_ID))); + query.Where.Conditions.Add(DQCondition.And(DQCondition.LessThanOrEqual("Time", dmo.Date), DQCondition.EQ("ProductBatch_ID", dmo.ProductBatch_ID))); query.Columns.Add(DQSelectColumn.Field("Goods_ID")); query.GroupBy.Expressions.Add(DQExpression.Field("Goods_ID")); query.Columns.Add(DQSelectColumn.Create(numCol, "Number"));