diff --git a/DOAN.Service/MES/Material/MmRecordInboundService.cs b/DOAN.Service/MES/Material/MmRecordInboundService.cs index 9aa2b05..dd6056b 100644 --- a/DOAN.Service/MES/Material/MmRecordInboundService.cs +++ b/DOAN.Service/MES/Material/MmRecordInboundService.cs @@ -3,6 +3,7 @@ using DOAN.Model.BZFM.Dto; using DOAN.Repository; using DOAN.Service.BZFM.IBZFMService; using Infrastructure.Attribute; +using Infrastructure.Converter; using Infrastructure.Extensions; using Microsoft.IdentityModel.Tokens; @@ -21,6 +22,11 @@ namespace DOAN.Service.BZFM /// public PagedInfo GetList(MmRecordInboundQueryDto parm) { + // 本地化日期,避免时差异常 + if (parm != null && parm.CreatedTime != null) + { + parm.CreatedTime = DOANConvertDate.ConvertLocalDate(parm.CreatedTime.Value); + } var predicate = QueryExp(parm); var response = Queryable() @@ -75,7 +81,7 @@ namespace DOAN.Service.BZFM var predicate = Expressionable.Create() .AndIF(!string.IsNullOrEmpty(parm.SupplierCode), it => it.SupplierCode.Contains(parm.SupplierCode)) .AndIF(!string.IsNullOrEmpty(parm.Operator), it => it.Operator.Contains(parm.Operator)) - //.AndIF(!string.IsNullOrEmpty(parm.CreatedTime), it => it.CreatedTime.Contains(parm.CreatedTime)) + .AndIF(parm.CreatedTime > DateTime.MinValue, it => it.CreatedTime < parm.CreatedTime) ; return predicate;