From a03fff91a9d00e97549a06d618c4121a552ac4d8 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Wed, 10 Apr 2024 11:14:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 4 ++-- src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs | 4 ++-- src/WMS.Web.Domain/Services/InStockService.cs | 2 +- src/WMS.Web.Repositories/BackRecordRepositories.cs | 4 ++-- src/WMS.Web.Repositories/BoxMarkRepositories.cs | 8 ++++---- src/WMS.Web.Repositories/InStockRepositories.cs | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index af0d4db4..3729ffa6 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -330,12 +330,12 @@ 操作人 - + 生成开始时间 - + 生成结束时间 diff --git a/src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs b/src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs index d6cf22d9..13461460 100644 --- a/src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs @@ -37,10 +37,10 @@ namespace WMS.Web.Core.Dto /// /// 生成开始时间 /// - public DateTime? BeginDate { get; set; } = null; + public DateTime? CreateBeginDate { get; set; } = null; /// /// 生成结束时间 /// - public DateTime? EndDate { get; set; } = null; + public DateTime? CreateEndDate { get; set; } = null; } } diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 6679af72..a5f46f5a 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -758,7 +758,7 @@ namespace WMS.Web.Domain.Services FormId = FormIdParam.PUR_PurchaseOrder.ToString(), TargetFormId = FormIdParam.STK_InStock.ToString(), DetailsId = s.ErpDetailId.ToString(), - IsDraftWhenSaveFail = true + IsDraftWhenSaveFail = true//是否需要暂存 }; //下推金蝶 var res = await this.Push(erpDto, s, entity.BillNo, sc_erpService, sc_inStockRepositories); diff --git a/src/WMS.Web.Repositories/BackRecordRepositories.cs b/src/WMS.Web.Repositories/BackRecordRepositories.cs index c98e008d..5735b98f 100644 --- a/src/WMS.Web.Repositories/BackRecordRepositories.cs +++ b/src/WMS.Web.Repositories/BackRecordRepositories.cs @@ -100,9 +100,9 @@ namespace WMS.Web.Repositories query = query.Where(w => ids.Contains(w.order.CreatorId)); if (dto.CreateBeginDate != null) - query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value); + query = query.Where(w => w.order.CreateTime.Date >= dto.CreateBeginDate.Value); if (dto.CreateEndDate != null) - query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value); + query = query.Where(w => w.order.CreateTime.Date <= dto.CreateEndDate.Value); int total = await query.CountAsync(); var list = await query.Select(s => new BackRecordQueryResponse() diff --git a/src/WMS.Web.Repositories/BoxMarkRepositories.cs b/src/WMS.Web.Repositories/BoxMarkRepositories.cs index bd1072de..b9542815 100644 --- a/src/WMS.Web.Repositories/BoxMarkRepositories.cs +++ b/src/WMS.Web.Repositories/BoxMarkRepositories.cs @@ -119,10 +119,10 @@ namespace WMS.Web.Repositories if (!string.IsNullOrEmpty(dto.Creator)) query = query.Where(w => cr_ids.Contains(w.order.CreatorId)); - if (dto.BeginDate != null) - query = query.Where(w => w.order.CreateTime.Date >= dto.BeginDate.Value); - if (dto.EndDate != null) - query = query.Where(w => w.order.CreateTime.Date <= dto.EndDate.Value); + if (dto.CreateBeginDate != null) + query = query.Where(w => w.order.CreateTime.Date >= dto.CreateBeginDate.Value); + if (dto.CreateEndDate != null) + query = query.Where(w => w.order.CreateTime.Date <= dto.CreateEndDate.Value); int total = await query.CountAsync(); var list = await query.Select(s => new BoxMarkQueryResponse() diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 444a7a93..e1c5ca41 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -348,9 +348,9 @@ namespace WMS.Web.Repositories query = query.Where(w => (int)w.order.Type == dto.Type.Value); if (dto.CreateBeginDate != null) - query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value); + query = query.Where(w => w.order.CreateTime.Date >= dto.CreateBeginDate.Value); if (dto.CreateEndDate != null) - query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value); + query = query.Where(w => w.order.CreateTime.Date <= dto.CreateEndDate.Value); if (dto.SuccessSync.HasValue) {