From 55bf797dcc730b37bc691ebab2b51ff9db8ed245 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 06 5月 2025 17:37:23 +0800
Subject: [PATCH] 修改代码样式

---
 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs
index e5d3c77..522c3b5 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs
@@ -7,6 +7,7 @@
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Data;
 using Volo.Abp.ObjectExtending;
+using CMS.Plugin.HIAWms.Domain.Shared.Util;
 
 namespace CMS.Plugin.HIAWms.Application.Implements;
 
@@ -41,8 +42,9 @@
         }
 
         var specification = new WmsStoreSpecification(input.Name);
-        var count = await _wmsstoreRepository.GetCountAsync(input.Filter, specification);
-        var list = await _wmsstoreRepository.GetListAsync(input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);
+        var store = ObjectMapper.Map<GetWmsStoresInput, WmsStore>(input);
+        var count = await _wmsstoreRepository.GetCountAsync(store,input.Filter, specification);
+        var list = await _wmsstoreRepository.GetListAsync(store,input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);
 
         return new PagedResultDto<WmsStoreDto>(count, ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(list));
     }
@@ -60,10 +62,8 @@
 
         var maxSort = await _wmsstoreRepository.GetMaxSortAsync();
         var sort = input.Sort ?? maxSort;
-        var wmsstore = new WmsStore
-        {
-
-        };
+        var wmsstore = ObjectMapper.Map<WmsStoreCreateDto,WmsStore>(input);
+        wmsstore.Sort = sort;
         input.MapExtraPropertiesTo(wmsstore, MappingPropertyDefinitionChecks.None);
 
         await _wmsstoreRepository.InsertAsync(wmsstore);
@@ -91,7 +91,8 @@
         wmsstore.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
         input.MapExtraPropertiesTo(wmsstore, MappingPropertyDefinitionChecks.None);
 
-        wmsstore.StoreCode = input.StoreCode;
+        wmsstore.StoreName = input.StoreName;
+        wmsstore.Remark = input.Remark;
 
         await _wmsstoreRepository.UpdateAsync(wmsstore);
 
@@ -151,7 +152,7 @@
     /// <inheritdoc />
     public virtual async Task AdjustSortAsync(Guid id, int sort)
     {
-        var list = await _wmsstoreRepository.GetListAsync(nameof(WmsStore.Sort));
+        var list = await _wmsstoreRepository.GetListAsync(null,nameof(WmsStore.Sort));
         if (list != null && list.Any())
         {
             var initSort = 1;
@@ -284,12 +285,13 @@
         }
 
         var specification = new WmsStoreSpecification(input.Name);
-        var list = await _wmsstoreRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+        var store = ObjectMapper.Map<GetWmsStoresInput, WmsStore>(input);
+        var list = await _wmsstoreRepository.GetListAsync(store, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
         var result = ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(list);
 
         var sheets = new Dictionary<string, object>
         {
-            ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(),
+            ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
         };
 
         var fileName = result.Count > 1 ? "WmsStore鍒楄〃" : result.Count == 1 ? result.First()?.StoreCode : "WmsStore妯$増";

--
Gitblit v1.9.3