Browse Source

更新版本

Agv分支2024-11-19
赵新宇 4 months ago
parent
commit
a15ab9235c
  1. 1
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PostionLocations/Inputs/PostionLocationImportInput.cs
  2. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs
  3. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs
  4. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs
  5. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
  6. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/SparePartIssueRequests/SparePartIssueRequestAppService.cs

1
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PostionLocations/Inputs/PostionLocationImportInput.cs

@ -16,6 +16,7 @@ public class PostionLocationImportInput : SfsBaseDataImportInputBase
/// 名称
/// </summary>
[Display(Name = "名称")]
[Required(ErrorMessage = "{0}是必填项")]
public string Name { get; set; }
/// <summary>

6
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;

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs

@ -188,7 +188,9 @@ public class CoatingIssueRequestAppService : SfsStoreRequestAppServiceBase<Coati
if (coatingIssueJobDtos.Any(p =>
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;
}

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs

@ -188,7 +188,10 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
if (injectionIssueJobDtos.Any(p =>
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;
}

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs

@ -191,7 +191,10 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
if (kittingIssueJobDtos.Any(p =>
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;
}

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/SparePartIssueRequests/SparePartIssueRequestAppService.cs

@ -68,7 +68,11 @@ public class SparePartIssueRequestAppService : SfsStoreRequestAppServiceBase<Spa
if (sparePartIssueJobDto.JobStatus == EnumJobStatus.Open ||
sparePartIssueJobDto.JobStatus == EnumJobStatus.Partial ||
sparePartIssueJobDto.JobStatus == EnumJobStatus.Doing ||
sparePartIssueJobDto.JobStatus == EnumJobStatus.Wait)
sparePartIssueJobDto.JobStatus == EnumJobStatus.Wait ||
p.JobStatus == EnumJobStatus.WaitAgv
)
{
await _sparePartIssueJobAppService.CancelAsync(sparePartIssueJobDto.Id).ConfigureAwait(false);
}

Loading…
Cancel
Save