From fe3e105458e47a59d2c3877ce639e635d5536d7c Mon Sep 17 00:00:00 2001 From: zhaoxinyu <89237069@qq.com> Date: Mon, 15 Apr 2024 15:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D=E7=A9=BA?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Authenticaitons/BaererToken.cs | 2 +- .../Authenticaitons/ITokenService.cs | 2 +- .../Authenticaitons/TokenService.cs | 2 +- .../Client/WebApi.cs | 2 +- .../FawtygAutoMapperProfile.cs | 2 +- .../HttpAuthorizationHandler.cs | 4 +- .../Incoming/InjectionMoldingRequestReader.cs | 54 ++++++++----------- ...tionMoldingTaskIncomingBackgroundWorker.cs | 4 +- .../InjectionMoldingTaskAgentHostedService.cs | 2 +- .../InjectionMoldingTaskAgentModule.cs | 2 +- .../InjectionMoldingTaskAgentService.cs | 2 +- .../InjectionMoldingTaskOptions.cs | 2 +- ...tionMoldingTaskOutgoingBackgroundWorker.cs | 2 +- .../Program.cs | 2 +- 14 files changed, 38 insertions(+), 46 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/BaererToken.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/BaererToken.cs index f03e11afd..ae5876e3b 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/BaererToken.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/BaererToken.cs @@ -1,6 +1,6 @@ using System; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Authenticaitons; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Authenticaitons; public class BaererToken { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/ITokenService.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/ITokenService.cs index 66c7736a7..72b519012 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/ITokenService.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/ITokenService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Authenticaitons; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Authenticaitons; public interface ITokenService : ITransientDependency { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/TokenService.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/TokenService.cs index eb1a54651..836c250c3 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/TokenService.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Authenticaitons/TokenService.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Volo.Abp; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Authenticaitons; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Authenticaitons; public class TokenService : ITokenService { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs index def81ffb7..3842deec2 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Options; using StackExchange.Redis; using Volo.Abp.Application.Services; using Win_in.Sfs.Wms.DataExchange.Domain; -using Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +using Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; using static Volo.Abp.Identity.Settings.IdentitySettingNames; namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Client; diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/FawtygAutoMapperProfile.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/FawtygAutoMapperProfile.cs index 0f32b55f7..3b8406c0a 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/FawtygAutoMapperProfile.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/FawtygAutoMapperProfile.cs @@ -9,7 +9,7 @@ using Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote; using Win_in.Sfs.Wms.DataExchange.WMS.ScrapNote; using Win_in.Sfs.Wms.Store.Application.Contracts; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class FawtygAutoMapperProfile : Profile { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/HttpAuthorizationHandler.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/HttpAuthorizationHandler.cs index 55ef3d385..f66ea4c4a 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/HttpAuthorizationHandler.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/HttpAuthorizationHandler.cs @@ -1,9 +1,9 @@ using System; using Microsoft.Extensions.Configuration; using Volo.Abp.DependencyInjection; -using Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Authenticaitons; +using Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Authenticaitons; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class HttpAuthorizationHandler : ISingletonDependency { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs index cc8fdbf53..a4cf337f7 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs @@ -18,8 +18,9 @@ using Win_in.Sfs.Wms.DataExchange.WMS.PCK; using Win_in.Sfs.Wms.Store.Application.Contracts; using System.Text.Json.Serialization; using System.IdentityModel.Tokens.Jwt; +using Volo.Abp; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Incoming; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming; public class InjectionMoldingRequestReader : IReader { @@ -27,21 +28,19 @@ public class InjectionMoldingRequestReader : IReader private readonly IInjectionRequestAppService _injectionRequest; private readonly IItemBasicAppService _itemService; private readonly ILocationAppService _locService; - private readonly IIncomingFromExternalManager _incomingFromExternalManager; private readonly ILogger _logger; private readonly IOptions _options; private readonly IHttpClientFactory _httpClientFactory; - public InjectionMoldingRequestReader( IInjectionRequestAppService injectionRequest , IIncomingFromExternalManager incomingFromExternalManager , ILogger logger - ,IOptions options + , IOptions options , IHttpClientFactory httpClientFactory - ,IItemBasicAppService itemService - ,ILocationAppService locService + , IItemBasicAppService itemService + , ILocationAppService locService ) { @@ -63,9 +62,9 @@ public class InjectionMoldingRequestReader : IReader Filter filter = new Filter() { Action = "<>", - Column = "JobStatus", + Column = "RequestStatus", Logic = EnumFilterLogic.And.ToString(), - Value = ((int)EnumJobStatus.Done).ToString() + Value = ((int)EnumRequestStatus.Completed).ToString() }; jobCondition.Condition.Filters.Add(filter); var jobs = await _injectionRequest.GetAllListByFilterAsync(jobCondition).ConfigureAwait(false); @@ -81,12 +80,8 @@ public class InjectionMoldingRequestReader : IReader _logger.LogError($"没有读取到摄像头信息{DateTime.Now},请检查网络"); return new List(); } - - - cameraList = System.Text.Json.JsonSerializer.Deserialize>(camera);//camera转注塑叫料明细任务数据 - InjectionRequestEditInput input=new InjectionRequestEditInput(); List injectionRequestDetails = new List(); @@ -113,29 +108,37 @@ public class InjectionMoldingRequestReader : IReader await _injectionRequest.CreateAsync(input).ConfigureAwait(false); } } - catch (Exception ex) + catch (AbpException ex) { _logger.LogError(ex.Message); } + catch (JsonException ex) + { + _logger.LogError(ex.Message); + } + catch (Exception ex) + { + _logger.LogError(ex.Message); + } return new List(); } private async Task> BindAsync(List p_list) { List errors = new List(); - foreach (var request in p_list) { var itm =await _itemService.GetByCodeAsync(request.ItemCode).ConfigureAwait(false); - if(itm == null) { errors.Add($"编号:{request.ItemCode}零件表中没找到!" ); }else + if(itm == null) { errors.Add($"编号:{request.ItemCode}零件表中没找到!" ); } + else { request.ItemDesc1 = itm.Desc1; request.ItemDesc2 = itm.Desc2; request.ItemName = itm.Name; - } var loc = await _locService.GetByCodeAsync(request.ToLocationCode).ConfigureAwait(false); - if (loc == null) { errors.Add($"编号:{request.ToLocationCode}库位表中没找到!"); }else + if (loc == null) { errors.Add($"编号:{request.ToLocationCode}库位表中没找到!"); } + else { request.ToLocationCode = loc.Code; request.ToLocationGroup = loc.LocationGroupCode; @@ -143,18 +146,11 @@ public class InjectionMoldingRequestReader : IReader request.ToWarehouseCode= loc.WarehouseCode; } } - - return errors; - } - - - - /// - /// + /// 读取摄像头API /// /// /// @@ -168,7 +164,7 @@ public class InjectionMoldingRequestReader : IReader var client = _httpClientFactory.CreateClient(); var credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}")); client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials); - var response = await client.GetAsync("https://example.com/api/data").ConfigureAwait(false); + var response = await client.GetAsync(address).ConfigureAwait(false); if (response.IsSuccessStatusCode) { return await response.Content.ReadAsStringAsync().ConfigureAwait(false); @@ -180,7 +176,7 @@ public class InjectionMoldingRequestReader : IReader public class InjectionRequest { /// - /// 零件吗 + /// 零件M /// public string ItemCode { get; set; } /// @@ -200,10 +196,6 @@ public class InjectionMoldingRequestReader : IReader /// public decimal Qty { get; set; } - - - - } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs index 0c925031a..e9464cf25 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs @@ -6,10 +6,10 @@ using Microsoft.Extensions.Options; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Threading; using Volo.Abp.Uow; -using Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Incoming; +using Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming; using Win_in.Sfs.Wms.Store.Application.Contracts; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class InjectionMoldingTaskIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentHostedService.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentHostedService.cs index e74443d3b..a85952572 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentHostedService.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentHostedService.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using Volo.Abp; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class InjectionMoldingTaskAgentHostedService : IHostedService { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs index 15d305474..285b11d99 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs @@ -24,7 +24,7 @@ using Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore; using Win_in.Sfs.Wms.Inventory.Application.Contracts; using Win_in.Sfs.Wms.Store.Application.Contracts; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; [DependsOn( typeof(AbpAutofacModule), diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentService.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentService.cs index ca7ca6964..f40a2222b 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentService.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentService.cs @@ -1,7 +1,7 @@ using System; using Volo.Abp.DependencyInjection; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class InjectionMoldingTaskAgentService : ITransientDependency { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskOptions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskOptions.cs index 8a21a7193..5975a313e 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskOptions.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskOptions.cs @@ -1,6 +1,6 @@ using System.Net; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class InjectionMoldingTaskOptions { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Outgoing/InjectionMoldingTaskOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Outgoing/InjectionMoldingTaskOutgoingBackgroundWorker.cs index 65c92619e..3cc4e2ca2 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Outgoing/InjectionMoldingTaskOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Outgoing/InjectionMoldingTaskOutgoingBackgroundWorker.cs @@ -7,7 +7,7 @@ using Volo.Abp.Threading; using Volo.Abp.Uow; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class InjectionMoldingTaskOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Program.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Program.cs index 633c4d089..a5a7bd43c 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Program.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Program.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Serilog; -namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; +namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class Program {