diff --git a/.vs/WZC2/v17/.wsuo b/.vs/WZC2/v17/.wsuo index 1bda40505..530a087c5 100644 Binary files a/.vs/WZC2/v17/.wsuo and b/.vs/WZC2/v17/.wsuo differ 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; } + }