From a15ab9235c294426d17fd507c5dd2315e2393625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 26 Dec 2024 15:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PostionLocations/Inputs/PostionLocationImportInput.cs | 1 + .../Jobs/IssueJobs/proxy/AgvJobClient.cs | 6 +++++- .../CoatingIssueRequests/CoatingIssueRequestAppService.cs | 4 +++- .../InjectionIssueRequestAppService.cs | 5 ++++- .../KittingIssueRequests/KittingIssueRequestAppService.cs | 5 ++++- .../SparePartIssueRequestAppService.cs | 6 +++++- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PostionLocations/Inputs/PostionLocationImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PostionLocations/Inputs/PostionLocationImportInput.cs index d76ae1f53..f9e35ef59 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PostionLocations/Inputs/PostionLocationImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PostionLocations/Inputs/PostionLocationImportInput.cs @@ -16,6 +16,7 @@ public class PostionLocationImportInput : SfsBaseDataImportInputBase /// 名称 /// [Display(Name = "名称")] + [Required(ErrorMessage = "{0}是必填项")] public string Name { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs index dad0f92fd..29d4acde6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs @@ -34,8 +34,12 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] public partial class AgvJobClient { + + + + #pragma warning disable 8618 - private string _baseUrl; + private string _baseUrl; #pragma warning restore 8618 private System.Net.Http.HttpClient _httpClient; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs index 2bfd6d037..90e2e0931 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs @@ -188,7 +188,9 @@ public class CoatingIssueRequestAppService : SfsStoreRequestAppServiceBase p.JobStatus == EnumJobStatus.Open || p.JobStatus == EnumJobStatus.Doing || - p.JobStatus == EnumJobStatus.Partial|| p.JobStatus== EnumJobStatus.Wait)) + p.JobStatus == EnumJobStatus.Partial|| p.JobStatus== EnumJobStatus.Wait + || p.JobStatus == EnumJobStatus.WaitAgv + )) { return; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs index 51efdbeae..f8bf048f9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs @@ -188,7 +188,10 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase p.JobStatus == EnumJobStatus.Open || p.JobStatus == EnumJobStatus.Doing || - p.JobStatus == EnumJobStatus.Partial|| p.JobStatus== EnumJobStatus.Wait)) + p.JobStatus == EnumJobStatus.Partial|| p.JobStatus== EnumJobStatus.Wait || + p.JobStatus == EnumJobStatus.WaitAgv + + )) { return; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs index f34043c7a..aa56deca7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs @@ -191,7 +191,10 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase p.JobStatus == EnumJobStatus.Open || p.JobStatus == EnumJobStatus.Doing || - p.JobStatus == EnumJobStatus.Partial||p.JobStatus== EnumJobStatus.Wait)) + p.JobStatus == EnumJobStatus.Partial||p.JobStatus== EnumJobStatus.Wait + p.JobStatus == EnumJobStatus.WaitAgv + + )) { return; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/SparePartIssueRequests/SparePartIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/SparePartIssueRequests/SparePartIssueRequestAppService.cs index ba15d644e..8a55c43bd 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/SparePartIssueRequests/SparePartIssueRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/SparePartIssueRequests/SparePartIssueRequestAppService.cs @@ -68,7 +68,11 @@ public class SparePartIssueRequestAppService : SfsStoreRequestAppServiceBase