From dc60387acc0410453d94f5de5d4d84760577167a Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Tue, 31 Oct 2023 11:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=B4=A7=E6=98=8E=E7=BB=86=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/Dtos/RequestDto.cs               |  7 +++++++
 .../Entities/BQ/VmiAppService.cs                 | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/RequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/RequestDto.cs
index 46248a9d..a9487694 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/RequestDto.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/RequestDto.cs
@@ -1,3 +1,4 @@
+using System;
 using Win.Sfs.Shared.DtoBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
@@ -5,4 +6,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     public class RequestDto : RequestDtoBase
     {
     }
+
+    public class ARequestDto : RequestDtoBase
+    {
+        public string startBillTime { get; set; }
+        public string endBillTime { get; set; }
+    }
 }
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 d90f2011..13510c91 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
@@ -395,15 +395,27 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// 补货数据导出
         /// </summary>
         [HttpPost]
-        public async Task<string> ReplenishedExportAsync(RequestDto input)
+        public async Task<string> ReplenishedExportAsync(ARequestDto input)
         {
-            var entities = await _logRepository.GetListByFilterAsync(input.Filters).ConfigureAwait(false);
+            RequestDto inputTemp = new RequestDto();
+            //inputTemp.Filters.Add(new FilterCondition("BillTime", input.startBillTime, EnumFilterAction.BiggerThanOrEqual, EnumFilterLogic.And));
+            //inputTemp.Filters.Add(new FilterCondition("BillTime", input.endBillTime, EnumFilterAction.SmallThanOrEqual, EnumFilterLogic.And));
+
+            //var entities = await _logRepository.GetListByFilterAsync(inputTemp.Filters,null,3,0).ConfigureAwait(false);
+            var beginDate= DateTime.Parse(input.startBillTime).ToString("yyyy/MM/dd") + " 00:00:00 ";
+            var endDate = DateTime.Parse(input.startBillTime).ToString("yyyy/MM/dd") + " 23:59:59 ";
+            DateTimeFormatInfo dtFormat = new DateTimeFormatInfo();
+            dtFormat.ShortDatePattern = "yyyy/MM/dd HH:mm:ss";
+            //DateTime aa= DateTime.ParseExact(DateTime.Parse(input.startBillTime).ToString("yyyy/MM/dd"), "yyyy/MM/dd HH:mm:ss", CultureInfo.InvariantCulture);
+
+            var entities = await _logRepository.Where(p=>p.BillTime>= DateTime.Parse(beginDate) && p.BillTime<= DateTime.Parse(endDate)).ToListAsync();
             //IQueryable<VmiLog> query = _logRepository.WhereIf(input.Filters?.Count != 0, input.Filters.ToLambda<VmiLog>());
             var fileName = $"补货数据_{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}.xlsx";
             var content = this.GetContent(entities, "补货数据_");
             await _fileContainer.SaveAsync(fileName, content, true).ConfigureAwait(false);
             return fileName;
         }
+       
 
         /// <summary>
         /// 4.寄售库存调整