From 3aedad63dd01f1fc5154cb520af32edab967d6e0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 09:15:26 +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 | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..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,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 />
@@ -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
--
Gitblit v1.9.3