From 343370b3e597f8972c43d92680787d404b41d6df Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Tue, 13 Jan 2026 15:15:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E6=9C=9F=E5=88=A4?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Service/MES/Material/MmInventoryService.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs index aa5e379..ab380a9 100644 --- a/DOAN.Service/MES/Material/MmInventoryService.cs +++ b/DOAN.Service/MES/Material/MmInventoryService.cs @@ -694,14 +694,14 @@ namespace DOAN.Service.BZFM result = Context .Queryable() .WhereIF( - parm.StartTime.Value > DateTime.MinValue, + parm.StartTime != null && parm.StartTime.Value > DateTime.MinValue, it => it.CreatedTime >= parm.StartTime ) .WhereIF( - parm.EndTime.Value > DateTime.MinValue, + parm.EndTime != null && parm.EndTime.Value > DateTime.MinValue, it => it.CreatedTime <= parm.EndTime ) - .Where(it=> it.MaterialCode == parm.MaterialCode) + .Where(it => it.MaterialCode == parm.MaterialCode) .Where(it => it.SupplierCode == parm.SupplierCode) .Where(it => it.LocationCode == parm.LocationCode) .Where(it => it.BatchNo == parm.BatchNo) @@ -723,7 +723,7 @@ namespace DOAN.Service.BZFM Operator = it.Operator, CreatedTime = it.CreatedTime, Workorder = it.Workorder, - StoveCode = it.StoveCode + StoveCode = it.StoveCode, }) .ToPage(parm); } @@ -733,11 +733,11 @@ namespace DOAN.Service.BZFM result = Context .Queryable() .WhereIF( - parm.StartTime.Value > DateTime.MinValue, + parm.StartTime != null && parm.StartTime.Value > DateTime.MinValue, it => it.CreatedTime >= parm.StartTime ) .WhereIF( - parm.EndTime.Value > DateTime.MinValue, + parm.EndTime != null && parm.EndTime.Value > DateTime.MinValue, it => it.CreatedTime <= parm.EndTime ) .Where(it => it.MaterialCode == parm.MaterialCode) @@ -759,7 +759,7 @@ namespace DOAN.Service.BZFM TransactionType = it.TransactionType, Operator = it.Operator, CreatedTime = it.CreatedTime, - Workorder = it.Workorder + Workorder = it.Workorder, }) .ToPage(parm); }