From cb8543b802db2aa3891e93c3ca3a1eeb5bea0663 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 15 5月 2025 14:59:53 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 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 e9c095e..f69b16b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
 using CMS.Plugin.HIAWms.Application.Contracts.Services;
 using CMS.Plugin.HIAWms.Domain.WmsAreas;
 using CMS.Plugin.HIAWms.Domain.Shared;
@@ -7,7 +7,8 @@
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Data;
 using Volo.Abp.ObjectExtending;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
+using CMS.Plugin.HIAWms.Domain.WmsStores;
+using CmsQueryExtensions;
 
 namespace CMS.Plugin.HIAWms.Application.Implements;
 
@@ -15,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 />
@@ -32,7 +35,7 @@
     }
 
     /// <inheritdoc />
-    public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreasInput input)
+    public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreaInput input)
     {
         Check.NotNull(input, nameof(input));
 
@@ -42,7 +45,7 @@
         }
 
         var specification = new WmsAreaSpecification(input.Name);
-        var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
+        var area = ObjectMapper.Map<GetWmsAreaInput, 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);
 
@@ -64,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)
@@ -90,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);
 
@@ -222,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
@@ -286,7 +300,7 @@
     }
 
     /// <inheritdoc />
-    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input)
+    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreaInput input)
     {
         Check.NotNull(input, nameof(input));
 
@@ -296,7 +310,7 @@
         }
 
         var specification = new WmsAreaSpecification(input.Name);
-        var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
+        var area = ObjectMapper.Map<GetWmsAreaInput, 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);
 

--
Gitblit v1.9.3