From 6f05b2aa4dcba4280871de744eaec227bce19810 Mon Sep 17 00:00:00 2001 From: zhaoxinyu <89237069@qq.com> Date: Wed, 5 Jun 2024 15:40:15 +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 --- .vs/WZC2/v17/.wsuo | Bin 121856 -> 235008 bytes .../Incoming/InjectionMoldingRequestReader.cs | 12 +---- .../AssembleIssueJobAppService.cs | 2 +- .../CoatingIssueJobAppService.cs | 41 +++++++++++++++--- .../InjectionIssueJobAppService.cs | 4 +- .../KittingIssueJobAppService.cs | 2 +- .../SparePartIssueJobAppService.cs | 2 +- .../IssueJobs/proxy/IssueJobToRestoClient.cs | 20 ++++++++- .../Options/RestoOptions.cs | 2 + 9 files changed, 61 insertions(+), 24 deletions(-) diff --git a/.vs/WZC2/v17/.wsuo b/.vs/WZC2/v17/.wsuo index 1bda40505b03ae7f4b445bcd6346223f56b548c9..530a087c521a952df09c4c49fc0b10526b3dc4b2 100644 GIT binary patch delta 7945 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 ZSA}FM1Bp6dcZ6iJ2^Xa_q;|@K_~*`I{x$#r 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 47335b81c..1fd2e4623 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 @@ -122,17 +122,6 @@ public class InjectionMoldingRequestReader : IReader _logger.LogInformation(MakeGrid($"标识{guid}读取{invterval}次接口表",camralist1)); - - - - - - - - - - - sw.Stop(); //按区域、货位号、零件、标志 @@ -454,6 +443,7 @@ public class InjectionMoldingRequestReader : IReader sb.Append("|"); sb.AppendLine(); } + return sb.ToString(); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index 71385a607..cec048b51 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs @@ -347,7 +347,7 @@ public class AssembleIssueJobAppService Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); } - var client = new IssueJobToRestoClient(_options.Value.Address, httpclient); + var client = new IssueJobToRestoClient(_options.Value.Address, httpclient, _options.Value.Path); ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); } catch (Exception ex) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs index af401bc86..78050398d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using Castle.Components.DictionaryAdapter; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using MyNamespace; using Volo.Abp; @@ -40,11 +41,14 @@ public class CoatingIssueJobAppService private readonly IHttpClientFactory _httpClientFactory; private readonly ITransferLibRequestAppService _transferLibRequestAppService; private readonly IOptions _options; + private readonly ILogger _logger; protected ICoatingIssueRequestAppService CoatingIssueRequestAppService => LazyServiceProvider.LazyGetRequiredService(); public CoatingIssueJobAppService( + + ILogger logger, ICoatingIssueJobRepository repository, ICoatingIssueJobManager coatingIssueJobManager, ILocationAppService locationAppService, ICoatingIssueNoteAppService coatingIssueNoteAppService, IExpectOutAppService expectOutAppService @@ -59,6 +63,7 @@ public class CoatingIssueJobAppService _httpClientFactory = httpClientFactory; _options = options; _transferLibRequestAppService = transferLibRequestAppService; + _logger = logger; } [HttpPost("get-by-number-2")] @@ -315,7 +320,7 @@ public class CoatingIssueJobAppService var ret = new ReusltObject(); ret.Code = "1"; ret.Message = "操作成功"; - ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); + ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); try { var IssueJobToRestoDetailDTOs = new List(); @@ -341,12 +346,24 @@ public class CoatingIssueJobAppService #if DEBUG var json = JsonSerializer.Serialize(main); - _options.Value.Address = "http://localhost:59094/"; //测试地址 + _options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址 _options.Value.Token = ""; //测试token _options.Value.UserName = ""; //测试用户名 _options.Value.Password = ""; //测试密码 + _options.Value.Path = "zozocnApi/custom/receiveProductionPlan"; //测试密码 #endif + + //var json = JsonSerializer.Serialize(main); + _options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址 + _options.Value.Token = ""; //测试token + _options.Value.UserName = ""; //测试用户名 + _options.Value.Password = ""; //测试密码 + _options.Value.Path = "zozocnApi/custom/receiveProductionPlan"; //测试密码 + + _logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(_options)); + + if (!string.IsNullOrEmpty(_options.Value.Token)) { var token = _options.Value.Token; @@ -361,15 +378,22 @@ public class CoatingIssueJobAppService Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); } - var client = new IssueJobToRestoClient(_options.Value.Address, httpclient); + var client = new IssueJobToRestoClient(_options.Value.Address, httpclient,_options.Value.Path); + + var flag=DateTime.Now.ToString("yyyyMMddHHmmss"); + _logger.LogInformation($"标志{flag}开始调用高通WMS:传递值{System.Text.Json.JsonSerializer.Serialize(main)}"); + ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); + + _logger.LogInformation($"标志{flag}调用高通WMS:返回值{ret}"); + } catch (Exception ex) { ret = new ReusltObject(); ret.Code = "2"; ret.Message = ex.Message; - ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); + ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); } return ret; @@ -382,7 +406,7 @@ public class CoatingIssueJobAppService var json = JsonSerializer.Serialize(input); #endif var errors = new List(); - var ret = new ReusltObject { Code = "1", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" }; + var ret = new ReusltObject { Code = "1", OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Message = "操作成功" }; try { if (input.Jobs.Count > 0) @@ -546,12 +570,17 @@ public class CoatingIssueJobAppService var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode) .ConfigureAwait(false); - + var flag = DateTime.Now.ToString("yyyyMMddHHmmss"); + _logger.LogInformation($"立体库任务检查开始{flag}"); if (loctionDto.Type == EnumLocationType.DimensionalStorehouse) { + + _logger.LogInformation($"立体库任务开始标记{flag}"); //TODO 立体库 var ret = await SyncIssueJobStereoAsync(new List { coatingIssueJobDto }, loctionDto.Code).ConfigureAwait(false); + + _logger.LogInformation($"立体库任务结束标记{flag}，返回值{ret}"); if (ret.Code != "1") { throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs index e79ba5940..59ed245e5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs @@ -325,7 +325,7 @@ public class InjectionIssueJobAppService #if DEBUG var json = JsonSerializer.Serialize(main); - _options.Value.Address = "http://localhost:59094/"; //测试地址 + _options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址 _options.Value.Token = ""; //测试token _options.Value.UserName = ""; //测试用户名 _options.Value.Password = ""; //测试密码 @@ -345,7 +345,7 @@ public class InjectionIssueJobAppService Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); } - var client = new IssueJobToRestoClient(_options.Value.Address, httpclient); + var client = new IssueJobToRestoClient(_options.Value.Address, httpclient, _options.Value.Path); ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); } catch (Exception ex) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs index a5afe53d0..050692f56 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs @@ -345,7 +345,7 @@ public class KittingIssueJobAppService Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); } - var client = new IssueJobToRestoClient(_options.Value.Address, httpclient); + var client = new IssueJobToRestoClient(_options.Value.Address, httpclient, _options.Value.Path); ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); } catch (Exception ex) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index 72645dc9c..1a8aafca9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -337,7 +337,7 @@ public class SparePartIssueJobAppService Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); } - var client = new IssueJobToRestoClient(_options.Value.Address, httpclient); + var client = new IssueJobToRestoClient(_options.Value.Address, httpclient, _options.Value.Path); ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); } catch (Exception ex) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs index 0f801929b..26101a196 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs @@ -34,11 +34,12 @@ namespace MyNamespace private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public IssueJobToRestoClient(string baseUrl, System.Net.Http.HttpClient httpClient) + public IssueJobToRestoClient(string baseUrl, System.Net.Http.HttpClient httpClient,string path) #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { BaseUrl = baseUrl; _httpClient = httpClient; + _path = path; } private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings() @@ -58,6 +59,21 @@ namespace MyNamespace _baseUrl += '/'; } } + private string _path; + public string Path + { + get { return _path; } + set + { + _path = value; + + } + } + + + + + protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _settings.Value; } } @@ -95,7 +111,7 @@ namespace MyNamespace var urlBuilder_ = new System.Text.StringBuilder(); if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); // Operation Path: "CargoState/SyncIssueJobStereo" - urlBuilder_.Append("CargoState/SyncIssueJobStereo");//修改路由需求 + urlBuilder_.Append(_path);//修改路由需求 PrepareRequest(client_, request_, urlBuilder_); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Options/RestoOptions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Options/RestoOptions.cs index e6cf97d3c..95ecb71d4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Options/RestoOptions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Options/RestoOptions.cs @@ -16,6 +16,8 @@ public class RestoOptions // 令牌 public string Token { set; get; } + public string Path { set; get; } + }