From 7d0b4bd1bda6ab6c39df24462c2e8a0df0a3b4c4 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 07 5月 2025 11:30:47 +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 | 6 ++++++
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx | 2 +-
HIAWms/web/src/config/menu.ts | 26 +++++++++++++-------------
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs | 2 +-
4 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
index 9e0ba7b..e6d32d1 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
@@ -248,7 +248,7 @@
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> CreationTime { get; set; }
+ public string CreationTime { get; set; }
/// <summary>
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..446240b 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;
@@ -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;
}
diff --git a/HIAWms/web/src/config/menu.ts b/HIAWms/web/src/config/menu.ts
index a0d0fd1..50692a5 100644
--- a/HIAWms/web/src/config/menu.ts
+++ b/HIAWms/web/src/config/menu.ts
@@ -35,16 +35,16 @@
"notPage": false
},
{
- "name": "Wms鐗╂枡鍩虹",
- "path": "/information-base/HIAWms",
- "patchName": "HIAWms",
+ "name": "API璇锋眰",
+ "path": "/information-base/Http",
+ "patchName": "Http",
"icon": "p",
"notPage": false
},
{
- "name": "API璇锋眰",
- "path": "/information-base/Http",
- "patchName": "Http",
+ "name": "Wms鐗╂枡鍩虹",
+ "path": "/information-base/HIAWms",
+ "patchName": "HIAWms",
"icon": "p",
"notPage": false
}
@@ -85,18 +85,18 @@
"icon": "p",
"notPage": false
},
- "HIAWms": {
- "name": "Wms鐗╂枡鍩虹",
- "path": "/information-base/HIAWms",
- "patchName": "HIAWms",
- "icon": "p",
- "notPage": false
- },
"Http": {
"name": "API璇锋眰",
"path": "/information-base/Http",
"patchName": "Http",
"icon": "p",
"notPage": false
+ },
+ "HIAWms": {
+ "name": "Wms鐗╂枡鍩虹",
+ "path": "/information-base/HIAWms",
+ "patchName": "HIAWms",
+ "icon": "p",
+ "notPage": false
}
};
\ No newline at end of file
diff --git a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
index 0cea796..cc3233c 100644
--- a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
@@ -304,7 +304,7 @@
MutableParam1: formData.value.MutableParam1,
MutableParam2: formData.value.MutableParam2,
MutableParam3: formData.value.MutableParam3,
- operateTime: formData.value.operateTime,
+ creationTime: formData.value.operateTime,
}
return data
}
--
Gitblit v1.9.3