From c095390b8cca409051cb69b57274c049c3bc18f4 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Tue, 26 Dec 2023 15:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs | 2 +- src/WMS.Web.Repositories/BackRecordRepositories.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs b/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs index 4d8b722c..c7a5221e 100644 --- a/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs @@ -73,7 +73,7 @@ namespace WMS.Web.Core.Dto /// 操作时间 /// [Column("操作时间")] - public DateTime CreateTime { get; set; } + public string CreateTime { get; set; } /// /// 操作人 /// diff --git a/src/WMS.Web.Repositories/BackRecordRepositories.cs b/src/WMS.Web.Repositories/BackRecordRepositories.cs index 6d136ac2..811f5ed8 100644 --- a/src/WMS.Web.Repositories/BackRecordRepositories.cs +++ b/src/WMS.Web.Repositories/BackRecordRepositories.cs @@ -87,6 +87,9 @@ namespace WMS.Web.Repositories .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order,box }) .Where(adv => 1 == 1); + if(!string.IsNullOrEmpty(dto.BoxBillNo)) + query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.BoxBillNo + "%")); + if (dto.SubStockId.HasValue) query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value); @@ -110,7 +113,7 @@ namespace WMS.Web.Repositories BoxBillNo = s.box.BoxBillNo, Type = s.order.Type.GetRemark(), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId), - CreateTime =s.order.CreateTime, + CreateTime =s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),