From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期三, 02 七月 2025 13:55:55 +0800 Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法,支持根据托盘号和下一地址查询任务,同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法,允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法,简化了任务查询逻辑并删除了多余的注释代码。同时,增加了对 `taskNext` 的处理逻辑,确保在任务未找到时的相应处理,并更新在途数据的逻辑,提升数据一致性和准确性。 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs | 78 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 72 insertions(+), 6 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 22663a4..b84189a 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 @@ -1,17 +1,29 @@ -锘縰sing Masuit.Tools; +锘縰sing LogLibrary.Log; +using Masuit.Tools; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; 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; public class UnbindService : IUnbindService { + private readonly LogFactory LogFactory = new LogFactory(); + private readonly ISys_ConfigService _configService; + + public UnbindService(ISys_ConfigService configRepository) + { + _configService = configRepository; + } + /// <summary> /// 鎵樼洏鍗曠數鑺В缁� /// </summary> @@ -19,8 +31,35 @@ /// <returns></returns> public async Task<dynamic> TrayCellUnbindAsync(TrayCellUnbindDto input) { - var inputJson = input.ToDictionary(); - var x = await HttpsClient.PostAsync("https://localhost:7273/api/Unbind/TrayCellUnbind", inputJson); + try + { + input.SessionId = Guid.NewGuid().ToString(); + input.Software = "WMS"; + input.EquipmentCode = "24MEJQ08-1091"; + input.EmployeeNo = "MITest"; + input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ"); + var inputJson = Masuit.Tools.ObjectExtensions.ToDictionary(input); + LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�1").Info(true, JsonConvert.SerializeObject(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, result); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Error(true, $"\r\r--------------------------------------"); + LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Error(true, ex.StackTrace); + } return Task.FromResult<dynamic>(null); } @@ -31,8 +70,35 @@ /// <returns></returns> public async Task<dynamic> TrayUnbindAsync(TrayUnbindDto input) { - var inputJson = input.ToDictionary(); - var x = await HttpsClient.PostAsync("https://localhost:7273/api/Unbind/TrayCellUnbind", inputJson); + try + { + input.SessionId = Guid.NewGuid().ToString(); + input.Software = "WMS"; + input.EquipmentCode = "24MEJQ08-1091"; + input.EmployeeNo = "MITest"; + input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ"); + var inputJson = Masuit.Tools.ObjectExtensions.ToDictionary(input); + Console.WriteLine(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, result); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + LogFactory.GetLog("鏁寸洏鐢佃姱瑙g粦").Error(true, $"\r\r--------------------------------------"); + LogFactory.GetLog("鏁寸洏鐢佃姱瑙g粦").Error(true, $"{ex.StackTrace}\r\r{ex.Message}"); + } return Task.FromResult<dynamic>(null); } -} +} \ No newline at end of file -- Gitblit v1.9.3