From b39af0f5e4e440f87ed40a03bd5e5cba255fe405 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 30 4月 2025 17:13:02 +0800
Subject: [PATCH] 前端页面修改

---
 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
index b3032ee..c70214a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
@@ -8,6 +8,7 @@
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Data;
 using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectMapping;
 
 namespace CMS.Plugin.HIAWms.Application.Implements;
 
@@ -42,8 +43,10 @@
         }
 
         var specification = new WmsMaterialSpecification(input.Name);
-        var count = await _wmsmaterialRepository.GetCountAsync(input.Filter, specification);
-        var list = await _wmsmaterialRepository.GetListAsync(input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);
+        var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
+        var count = await _wmsmaterialRepository.GetCountAsync(material,input.Filter, specification);
+
+        var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);
 
         return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list));
     }
@@ -163,7 +166,7 @@
     /// <inheritdoc />
     public virtual async Task AdjustSortAsync(Guid id, int sort)
     {
-        var list = await _wmsmaterialRepository.GetListAsync(nameof(WmsMaterial.Sort));
+        var list = await _wmsmaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort));
         if (list != null && list.Any())
         {
             var initSort = 1;
@@ -318,7 +321,9 @@
         }
 
         var specification = new WmsMaterialSpecification(input.Name);
-        var list = await _wmsmaterialRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+
+        var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
+        var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
         var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);
 
         var sheets = new Dictionary<string, object>

--
Gitblit v1.9.3