From 2aa6c82bef9d1a47b505e2b9c39adba27af6d9b7 Mon Sep 17 00:00:00 2001 From: zhaoxinyu <89237069@qq.com> Date: Wed, 19 Jun 2024 09:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/VmiAppService.cs | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs index 8e9abe6d..1321abe6 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs @@ -250,14 +250,25 @@ namespace Win.Sfs.SettleAccount.Entities.BQ input.Sorting= input.Sorting.ToUpper().Replace("BillTime".ToUpper(), "ReceiveTime".ToUpper()) .Replace("Qty".ToUpper(), "SumQty".ToUpper()); } - //var filterConditions = input.Filters.Where(p => p.Column == "SumQty"); - //foreach (var itm in filterConditions) - //{ - // if(itm) - // input.Filters.Add(new FilterCondition() { }); - //} + var filterConditions = input.Filters.Where(p => p.Column == "qty").ToArray(); + foreach (var itm in filterConditions) + { + if (itm.Action == EnumFilterAction.BiggerThanOrEqual) + { + input.Filters.Add(new FilterCondition() { Action= EnumFilterAction.BiggerThanOrEqual, Column="SumQty", Logic=EnumFilterLogic.And, Value=itm.Value }); + } + if (itm.Action == EnumFilterAction.SmallThanOrEqual) + { + input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.SmallThanOrEqual, Column = "SumQty", Logic = EnumFilterLogic.And, Value = itm.Value }); + } + input.Filters.Remove(itm); + + } + + + - var first = input.Filters.FirstOrDefault(p => p.Column == "BillTime"); + var first = input.Filters.FirstOrDefault(p => p.Column == "BillTime"); if (first != null) { input.Filters.Remove(first);