From 1acfd0dc4f695165dab633b5f45acc48047eb1b6 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 14 5月 2025 11:22:01 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs | 7 +++++++ 1 files changed, 7 insertions(+), 0 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 4dcc903..5a41555 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs @@ -4,6 +4,7 @@ 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; @@ -103,6 +104,7 @@ wmsplace.RedundantField2 = input.RedundantField2; wmsplace.RedundantField3 = input.RedundantField3; wmsplace.Remark = input.Remark; + wmsplace.IsDisabled = input.IsDisabled; await _wmsplaceRepository.UpdateAsync(wmsplace); @@ -316,6 +318,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