From dc2aad89c80958f6c444e82ab196cea931e6addc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 06:19:24 +0800
Subject: [PATCH] 222

---
 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
index b037ac9..42301c9 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
@@ -7,6 +7,8 @@
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Data;
 using Volo.Abp.ObjectExtending;
+using CMS.Plugin.HIAWms.Domain.WmsStores;
+using CmsQueryExtensions;
 
 namespace CMS.Plugin.HIAWms.Application.Implements;
 
@@ -14,14 +16,16 @@
 public class WmsAreaAppService : CMSPluginAppService, IWmsAreaAppService
 {
     private readonly IWmsAreaRepository _wmsareaRepository;
+    private readonly IWmsStoreRepository _wmsstoreRepository;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="WmsAreaAppService"/> class.
     /// </summary>
     /// <param name="wmsareaRepository">The task job repository.</param>
-    public WmsAreaAppService(IWmsAreaRepository wmsareaRepository)
+    public WmsAreaAppService(IWmsAreaRepository wmsareaRepository, IWmsStoreRepository wmsstoreRepository)
     {
         _wmsareaRepository = wmsareaRepository;
+        _wmsstoreRepository = wmsstoreRepository;
     }
 
     /// <inheritdoc />
@@ -41,8 +45,9 @@
         }
 
         var specification = new WmsAreaSpecification(input.Name);
-        var count = await _wmsareaRepository.GetCountAsync(input.Filter, specification);
-        var list = await _wmsareaRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
+        var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
+        var count = await _wmsareaRepository.GetCountAsync(area,input.Filter, specification);
+        var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
 
         return new PagedResultDto<WmsAreaDto>(count, ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list));
     }
@@ -62,8 +67,14 @@
         var sort = input.Sort ?? maxSort;
         var wmsarea = ObjectMapper.Map<WmsAreaCreateDto, WmsArea>(input);
         wmsarea.Sort = sort;
-        input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
+        var store = await _wmsstoreRepository.FindByNameAsync(input.StoreCode);
+        if (store == null)
+        {
+            throw new UserFriendlyException("浠撳簱淇℃伅涓嶅瓨");
+        }
 
+        input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
+        wmsarea.StoreName = store.StoreName;
         await _wmsareaRepository.InsertAsync(wmsarea);
 
         if (input.Sort.HasValue && wmsarea.Sort != maxSort)
@@ -88,13 +99,18 @@
 
         wmsarea.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
         input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
+        var store = await _wmsstoreRepository.FindByNameAsync(input.StoreCode);
+        if (store == null)
+        {
+            throw new UserFriendlyException("浠撳簱淇℃伅涓嶅瓨");
+        }
 
         wmsarea.AreaName = input.AreaName;
         wmsarea.AreaDesc = input.AreaDesc;
         wmsarea.AreaStatus = input.AreaStatus;
         wmsarea.AreaType = input.AreaType;
         wmsarea.StoreCode = input.StoreCode;
-        wmsarea.StoreName = input.StoreName;
+        wmsarea.StoreName = store.StoreName;
 
         await _wmsareaRepository.UpdateAsync(wmsarea);
 
@@ -153,7 +169,7 @@
     /// <inheritdoc />
     public virtual async Task AdjustSortAsync(Guid id, int sort)
     {
-        var list = await _wmsareaRepository.GetListAsync(nameof(WmsArea.Sort));
+        var list = await _wmsareaRepository.GetListAsync(null,nameof(WmsArea.Sort));
         if (list != null && list.Any())
         {
             var initSort = 1;
@@ -220,7 +236,7 @@
                     throw new UserFriendlyException(errorMsg);
                 }
 
-                var oldWmsArea = await _wmsareaRepository.FindByNameAsync(wmsarea.AreaName);
+                var oldWmsArea = await _wmsareaRepository.FindByNameAsync(wmsarea.AreaNo);
                 if (oldWmsArea != null)
                 {
                     var wmsareaUpdateDto = new WmsAreaUpdateDto
@@ -294,12 +310,13 @@
         }
 
         var specification = new WmsAreaSpecification(input.Name);
-        var list = await _wmsareaRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+        var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
+        var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
         var result = ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list);
 
         var sheets = new Dictionary<string, object>
         {
-            ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(),
+            ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
         };
 
         var fileName = result.Count > 1 ? "WmsArea鍒楄〃" : result.Count == 1 ? result.First()?.AreaName : "WmsArea妯＄増";

--
Gitblit v1.9.3