From b3f39444c398741b51284914f45d75c089881e82 Mon Sep 17 00:00:00 2001 From: 肖洋 <cathay_xy@163.com> Date: 星期一, 02 十二月 2024 14:18:10 +0800 Subject: [PATCH] 1111 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 107 ++++++++++++++++++++++++++++------------------------- 1 files changed, 57 insertions(+), 50 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs index 0b561e4..c47ade2 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs @@ -18,7 +18,7 @@ using WIDESEA_StoragIntegrationServices; using WIDESEAWCS_Model.Models; -namespace WIDESEA_StorageOutTaskServices; +namespace WIDESEA_StorageTaskServices; public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService { @@ -796,65 +796,72 @@ { while (true) { - Thread.Sleep(10000); - var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1"); - - var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>() - .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo - .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails - .Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢 - .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢 - .OrderBy(x => x.OutboundTime) // 鎺掑簭 - .ToListAsync(); // 鑾峰彇绗竴涓厓绱� - - if (stockInfo.Count <= 0) continue; - foreach (var item in stockInfo) + try { + Thread.Sleep(10000); + var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1"); - var hasTask = BaseDal.QueryFirst(x => x.PalletCode == item.PalletCode); - if (hasTask != null) + var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>() + .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo + .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails + .Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢 + .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢 + .OrderBy(x => x.OutboundTime) // 鎺掑簭 + .ToListAsync(); // 鑾峰彇绗竴涓厓绱� + + if (stockInfo.Count <= 0) continue; + foreach (var item in stockInfo) { - Console.WriteLine("宸插瓨鍦ㄥ嚭搴撲换鍔�"); - continue; + + var hasTask = BaseDal.QueryFirst(x => x.PalletCode == item.PalletCode); + if (hasTask != null) + { + Console.WriteLine("宸插瓨鍦ㄥ嚭搴撲换鍔�"); + continue; + } + + string position = string.Empty; + if (item.LocationInfo.RoadwayNo == "GWSC1") + position = "1059"; + else + position = "1065"; + + var task = CreateTask(item, position, (int)TaskOutboundTypeEnum.Outbound); + task.NextAddress = "002-000-002"; + // 鍒涘缓浠诲姟DTO + WMSTaskDTO taskDTO = CreateTaskDTO(task); + + + var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress); + var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue; + var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue; + if (wmsBase == null || ipAddress == null) + { + throw new InvalidOperationException("WMS IP 鏈厤缃�"); + } + var wmsIpAddress = wmsBase + ipAddress; + + var result = HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result; + var content = JsonConvert.DeserializeObject<WebResponseContent>(result); + if (content.Status) + { + await BaseDal.AddDataAsync(task); + // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢� + item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable; + await _locationRepository.UpdateDataAsync(item.LocationInfo); + } } - - string position = string.Empty; - if (item.LocationInfo.RoadwayNo == "GWSC1") - position = "1059"; - else - position = "1065"; - - var task = CreateTask(item, position, (int)TaskOutboundTypeEnum.Outbound); - task.NextAddress = "002-000-002"; - // 鍒涘缓浠诲姟DTO - WMSTaskDTO taskDTO = CreateTaskDTO(task); - - - var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress); - var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue; - var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue; - if (wmsBase == null || ipAddress == null) - { - throw new InvalidOperationException("WMS IP 鏈厤缃�"); - } - var wmsIpAddress = wmsBase + ipAddress; - - var result = HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result; - var content = JsonConvert.DeserializeObject<WebResponseContent>(result); - if (content.Status) - { - await BaseDal.AddDataAsync(task); - // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢� - item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable; - await _locationRepository.UpdateDataAsync(item.LocationInfo); - } + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); } } }); return webResponseContent.OK(); } catch (Exception ex) - { + { Console.WriteLine(ex.Message.ToString()); return webResponseContent.Error(ex.Message); } -- Gitblit v1.9.3