From 31eba6a8c6261adf5bfef4dafad4dc8efc1f66a2 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期二, 18 二月 2025 18:57:54 +0800 Subject: [PATCH] 1 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs index f4f8c6e..4225e41 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs @@ -7,7 +7,9 @@ using System.Text; using System.Threading.Tasks; using WIDESEA_Common; +using WIDESEA_Core.Const; using WIDESEA_DTO; +using WIDESEA_IServices; using WIDESEA_IStoragIntegrationServices; namespace WIDESEA_StoragIntegrationServices; @@ -15,6 +17,12 @@ public class UnbindService : IUnbindService { private readonly LogFactory LogFactory = new LogFactory(); + private readonly ISys_ConfigService _configService; + + public UnbindService(ISys_ConfigService configRepository) + { + _configService = configRepository; + } /// <summary> /// 鎵樼洏鍗曠數鑺В缁� @@ -27,14 +35,24 @@ { input.SessionId = Guid.NewGuid().ToString(); input.Software = "WMS"; - input.EquipmentCode = "ECH001-B"; - input.EmployeeNo = "T00001"; + input.EquipmentCode = "24MEJQ08-1091"; + input.EmployeeNo = "MITest"; input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ"); var inputJson = input.ToDictionary(); LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�1").Info(true, JsonConvert.SerializeObject(inputJson)); - var x = await HttpsClient.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/TrayCellUnbind", inputJson); + var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress); + var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue; + var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.TrayCellUnbind)?.ConfigValue; + if (wmsBase == null || ipAddress == null) + { + throw new InvalidOperationException("WMS IP 鏈厤缃�"); + } + var wmsIpAddress = wmsBase + ipAddress; + + var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result; + //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/TrayCellUnbind", inputJson); LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Info(true, $"\r\r--------------------------------------"); - LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Info(true, x); + LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Info(true, result); } catch (Exception ex) { @@ -56,14 +74,24 @@ { input.SessionId = Guid.NewGuid().ToString(); input.Software = "WMS"; - input.EquipmentCode = "ECH001-B"; - input.EmployeeNo = "T00001"; + input.EquipmentCode = "24MEJQ08-1091"; + input.EmployeeNo = "MITest"; input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ"); var inputJson = input.ToDictionary(); Console.WriteLine(inputJson); - var x = await HttpsClient.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/TrayUnbind", inputJson); + var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress); + var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue; + var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.TrayUnbind)?.ConfigValue; + if (wmsBase == null || ipAddress == null) + { + throw new InvalidOperationException("WMS IP 鏈厤缃�"); + } + var wmsIpAddress = wmsBase + ipAddress; + + var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result; + //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/TrayUnbind", inputJson); LogFactory.GetLog("鏁寸洏鐢佃姱瑙g粦").Info(true, $"\r\r--------------------------------------"); - LogFactory.GetLog("鏁寸洏鐢佃姱瑙g粦").Info(true, x); + LogFactory.GetLog("鏁寸洏鐢佃姱瑙g粦").Info(true, result); } catch (Exception ex) { -- Gitblit v1.9.3