From f656f107469ab3eb9f1c02d9b23fe5e052e6afb6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:21:04 +0800
Subject: [PATCH] 可空
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
index 8d3b362..446240b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
@@ -1,13 +1,14 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
+using CMS.Plugin.HIAWms.Domain.WmsPlaces;
+using CmsQueryExtensions;
+using System.Text.RegularExpressions;
using Volo.Abp;
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;
@@ -32,7 +33,7 @@
}
/// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsPlaceDto>> GetListAsync(GetWmsPlacesInput input)
+ public virtual async Task<PagedResultDto<WmsPlaceDto>> GetListAsync(GetWmsMaterialInfoInput input)
{
Check.NotNull(input, nameof(input));
@@ -42,7 +43,7 @@
}
var specification = new WmsPlaceSpecification(input.Name);
- var place = ObjectMapper.Map<GetWmsPlacesInput, WmsPlace>(input);
+ var place = ObjectMapper.Map<GetWmsMaterialInfoInput, WmsPlace>(input);
var count = await _wmsplaceRepository.GetCountAsync(place,input.Filter, specification);
var list = await _wmsplaceRepository.GetListAsync(place, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
@@ -285,7 +286,7 @@
}
/// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsPlacesInput input)
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInfoInput input)
{
Check.NotNull(input, nameof(input));
@@ -295,7 +296,7 @@
}
var specification = new WmsPlaceSpecification(input.Name);
- var place = ObjectMapper.Map<GetWmsPlacesInput, WmsPlace>(input);
+ var place = ObjectMapper.Map<GetWmsMaterialInfoInput, WmsPlace>(input);
var list = await _wmsplaceRepository.GetListAsync(place, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
var result = ObjectMapper.Map<List<WmsPlace>, List<WmsPlaceDto>>(list);
@@ -316,6 +317,11 @@
{
Check.NotNull(input, nameof(input));
Check.NotNullOrWhiteSpace(input.PlaceNo, "缂栧彿", WmsPlaceConsts.MaxCodeLength);
+ string pattern = @"^\d-\d$";
+ if (input.StorageTypeNo == Domain.Shared.Enums.PlaceTypeEnum.YUANLIAOKUWEI && !Regex.IsMatch(input.PlaceNo, pattern))
+ {
+ throw new UserFriendlyException("搴撲綅缂栧彿鏍煎紡閿欒");
+ }
Check.Length(input.Remark, "澶囨敞", WmsPlaceConsts.MaxRemarkLength);
return Task.CompletedTask;
}
--
Gitblit v1.9.3