From a982b8c9f5922684216cbc307a8507a627dde8d0 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <1247017146@qq.com> Date: 星期六, 10 五月 2025 20:48:58 +0800 Subject: [PATCH] 优化 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 365 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 213 insertions(+), 152 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 5182457..08c99d2 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 @@ -237,38 +237,38 @@ } // 澶勭悊寮傚父鐢佃姱鎯呭喌 - var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList(); - if (serialNosError.Count > 0) - { - if (stationManager.stationType != 3) - { - var taskNG = new Dt_Task - { - CurrentAddress = input.Position, - Grade = 1, - Roadway = input.Roadways, - TargetAddress = stationManager.stationNGLocation, - Dispatchertime = DateTime.Now, - MaterialNo = "", - NextAddress = stationManager.stationNGChildCode, - OrderNo = null, - PalletCode = input.PalletCode, - SourceAddress = stationManager.stationLocation, - TaskState = (int)TaskInStatusEnum.Line_InFinish, - TaskType = (int)TaskOutboundTypeEnum.InToOut, - TaskNum = await BaseDal.GetTaskNo(), - Creater = "System", - ProductionLine = result.ProductionLine, - ProcessCode = result.ProcessCode, - }; - return taskNG; - } - else - { - Console.WriteLine($"绔欏彴{stationManager.stationChildCode}MOM杩斿洖鐢佃姱寮傚父:{result.MOMMessage}"); - return null; - } - } + //var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList(); + //if (serialNosError.Count > 0) + //{ + // if (stationManager.stationType != 3) + // { + // var taskNG = new Dt_Task + // { + // CurrentAddress = input.Position, + // Grade = 1, + // Roadway = input.Roadways, + // TargetAddress = stationManager.stationNGLocation, + // Dispatchertime = DateTime.Now, + // MaterialNo = "", + // NextAddress = stationManager.stationNGChildCode, + // OrderNo = null, + // PalletCode = input.PalletCode, + // SourceAddress = stationManager.stationLocation, + // TaskState = (int)TaskInStatusEnum.Line_InFinish, + // TaskType = (int)TaskOutboundTypeEnum.InToOut, + // TaskNum = await BaseDal.GetTaskNo(), + // Creater = "System", + // ProductionLine = result.ProductionLine, + // ProcessCode = result.ProcessCode, + // }; + // return taskNG; + // } + // else + // { + // Console.WriteLine($"绔欏彴{stationManager.stationChildCode}MOM杩斿洖鐢佃姱寮傚父:{result.MOMMessage}"); + // return null; + // } + //} //else //{ // throw new Exception($"绔欏彴{stationManager.stationChildCode}MOM杩斿洖鐢佃姱寮傚父:{result.MOMMessage}"); @@ -541,13 +541,17 @@ if (stationManager.stationType != 7) throw new Exception("閿欒鐨勮皟鍙�"); // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅 - IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo); - List<DtStockInfo> stockInfoList = stockInfos.Values.ToList(); + //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo); + //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList(); - var stockinfo1 = stockInfoList.OrderBy(x => x.CreateDate) - .ToList(); - var stockinfo = stockinfo1.Where(x => x.LocationInfo != null && !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway) - .FirstOrDefault(); + //var stockinfo1 = stockInfoList.OrderBy(x => x.CreateDate) + // .ToList(); + //var stockinfo = stockinfo1.Where(x => x.LocationInfo != null && !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway) + // .FirstOrDefault(); + var stockinfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>() + .Where(x => !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway) + .OrderBy(x=>x.CreateDate) + .FirstAsync(); if (stockinfo == null) return null; @@ -569,7 +573,7 @@ Creater = "System", ProductionLine = stockinfo.ProductionLine, }; - _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { task.PalletCode }); + //_simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { task.PalletCode }); return task; } catch (Exception ex) @@ -980,23 +984,36 @@ .ToList().Select(x => x.DeviceCode).ToList(); // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅 - IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo); - List<DtStockInfo> stockInfoList = stockInfos.Values.ToList(); + //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo); + //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList(); - var result1 = stockInfoList.Where(x => x.ProductionLine == productLine) - .Where(x => x.AreaCode == areaCode && x.IsFull == false) - .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo)) - .OrderBy(x => x.CreateDate) // 鎺掑簭 - .ToList(); // 杞崲涓哄垪琛� + //var result1 = stockInfoList.Where(x => x.ProductionLine == productLine) + // .Where(x => x.AreaCode == areaCode && x.IsFull == false) + // .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo)) + // .OrderBy(x => x.CreateDate) // 鎺掑簭 + // .ToList(); // 杞崲涓哄垪琛� - var result = result1.Where(x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�")) - .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢 - .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱� + //var result = result1.Where(x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�")) + // .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢 + // .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱� - if (result != null) - _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode }); - else + //if (result != null) + // _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode }); + //else + // ConsoleHelper.WriteColorLine($"甯告俯{productLine}绌烘墭鐩樺簱瀛樹笉瓒�", ConsoleColor.Red); + var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>() + .Includes(x => x.LocationInfo) + .Includes(x => x.StockInfoDetails) + .Where(x => x.AreaCode == areaCode && x.IsFull == false && x.ProductionLine == productLine) + .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo)) + .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢 + .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�")) + .OrderBy(x => x.CreateDate) // 鎺掑簭 + .FirstAsync(); + + if (result.IsNullOrEmpty()) ConsoleHelper.WriteColorLine($"甯告俯{productLine}绌烘墭鐩樺簱瀛樹笉瓒�", ConsoleColor.Red); + return result; } @@ -1026,23 +1043,48 @@ .Where(x => x.DeviceCode.Contains("CWSC")) // 杩囨护鏉′欢 .ToList().Select(x => x.DeviceCode).ToList(); - // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅 - IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo); - List<DtStockInfo> stockInfoList = stockInfos.Values.ToList(); + //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel"); + var outBoundMateriel = _dt_ChangeoversRepository.QueryData(x => x.Status == "1").ToList(); + List<string>? materielCodes = outBoundMateriel.Count != 0 + ? outBoundMateriel.Where(x => x.ProductionLine == station.productLine && x.ProcessCode == "CWSC3") + .Select(x => x.MaterielCode) + .ToList() + : null; + #region + //// 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅 + //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo); + //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList(); + + //// 淇敼鍚庣殑鏌ヨ浠g爜 + //var stockInfo1 = stockInfoList + // .Where(x => x.ProductionLine == station.productLine) + // .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true) + // .OrderBy(x => x.OutboundTime) + // .ToList(); + + //var stockInfo = stockInfo1 + // // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌� + // .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock) + // // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌� + // .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo)) + // .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode))) + // .FirstOrDefault(); // 淇敼鍚庣殑鏌ヨ浠g爜 - var stockInfo1 = stockInfoList - .Where(x => x.ProductionLine == station.productLine) - .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true) - .OrderBy(x => x.OutboundTime) - .ToList(); + #endregion + var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>() + .Includes(x => x.LocationInfo) + .Includes(x => x.StockInfoDetails) + .Where(x => x.ProductionLine == station.productLine) + .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true) + // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌� + .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock) + // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌� + .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo)) + .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode))) + .OrderBy(x => x.OutboundTime) + .FirstAsync(); - var stockInfo = stockInfo1 - // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌� - .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock) - // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌� - .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo)) - .FirstOrDefault(); if (stockInfo == null) throw new Exception($"搴撳唴{station.productLine}鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�"); @@ -1079,7 +1121,7 @@ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable; _locationRepository.UpdateData(stockInfo.LocationInfo); - _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode }); + //_simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode }); _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(stockInfo.LocationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum); @@ -1106,100 +1148,119 @@ if (emergencyTask == null) throw new Exception("鐏鍙傛暟涓虹┖"); - DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == emergencyTask.row && x.Column == emergencyTask.column && x.Layer == emergencyTask.layer && x.AreaId == emergencyTask.zone); - if (locationInfo == null) + string[] strings = emergencyTask.LocationCode.Split("-"); + + string[] Roadways = strings[0].Select(x => x.ToString()).ToArray(); + string Roadway = string.Empty; + switch (Roadways[0]) { - throw new Exception("鏈煡搴撲綅"); + case "J": + Roadway = "JZSC" + Roadways[1]; + break; + case "G": + Roadway = "GWSC" + Roadways[1]; + break; + case "C": + Roadway = "CWSC" + Roadways[1]; + break; + default: throw new Exception("鏈瘑鍒簱浣嶇紪鐮�"); } - //鏌ユ壘娑堥槻绔欏彴 - var station = _stationManagerRepository.QueryFirst(t => t.Roadway == locationInfo.RoadwayNo - && t.stationType == (int)StationManager.FireStation - /*&& t. == "Enable"*/); - if (station == null) + for (int i = 0; i < 2; i++) { - throw new Exception("娑堥槻绔欏彴鏈厤缃�!"); - } - - //鏌ユ壘搴撳瓨淇℃伅 - var stockInfo = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode && x.LocationInfo.RoadwayNo == locationInfo.RoadwayNo); - //鎵樼洏鐮� - string barcode = string.Empty; - if (stockInfo != null) - { - barcode = stockInfo.PalletCode; - } - else - { - //鏃犲簱瀛樹俊鎭紝鐢熸垚闅忔満鎵樼洏鐮� - barcode = "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000); - } - - Dt_Task fireTask = BaseDal.QueryFirst(x => x.TaskType == 500 && x.SourceAddress == locationInfo.LocationCode && x.Roadway == station.Roadway); - - if (fireTask != null) - { - throw new Exception("宸叉坊鍔犵伀璀﹀嚭搴撲换鍔�"); - } - - int taskNum = BaseDal.GetTaskNo().Result; - Dt_Task task = new Dt_Task - { - CreateDate = DateTime.Now, - Creater = "DTS", - CurrentAddress = locationInfo.LocationCode, - Grade = 1, - Dispatchertime = DateTime.Now, - PalletCode = barcode, - Roadway = station.Roadway, - SourceAddress = locationInfo.LocationCode, - TaskState = (int)TaskOutStatusEnum.OutNew, - TaskType = 500, - TargetAddress = station.stationLocation, - NextAddress = station.stationChildCode, - TaskNum = taskNum, //_taskRepository.GetTaskNo().Result, - TaskId = 0, - }; - - // 灏濊瘯娣诲姞鏂颁换鍔� - WMSTaskDTO taskDTO = new WMSTaskDTO() - { - TaskNum = task.TaskNum.Value, - Grade = 1, - PalletCode = task.PalletCode, - RoadWay = task.Roadway, - SourceAddress = task.SourceAddress, - TargetAddress = task.TargetAddress, - TaskState = task.TaskState.Value, - Id = 0, - TaskType = 500, - }; - - var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress); - var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue; - var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSTask)?.ConfigValue; - if (ReceiveByWMSTask == null || ipAddress == null) - { - throw new Exception("WMS IP 鏈厤缃�"); - } - var wmsIpAddrss = ipAddress + ReceiveByWMSTask; - - var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTO)); - if (respon != null) - { - WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString()); - if (respone.Status) + DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Convert.ToInt16(strings[1]) && x.Column == Convert.ToInt16(strings[2]) && x.Layer == (i == 0 ? Convert.ToInt16(strings[3]) * 2 - 1 : Convert.ToInt16(strings[3]) * 2) && x.RoadwayNo == Roadway); + if (locationInfo == null) { - var taskId = BaseDal.AddData(task); + throw new Exception("鏈煡搴撲綅"); + } + + //鏌ユ壘娑堥槻绔欏彴 + var station = _stationManagerRepository.QueryFirst(t => t.Roadway == locationInfo.RoadwayNo && t.stationType == (int)StationManager.FireStation); + if (station == null) + { + throw new Exception("娑堥槻绔欏彴鏈厤缃�!"); + } + + //鏌ユ壘搴撳瓨淇℃伅 + var stockInfo = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode && x.LocationInfo.RoadwayNo == locationInfo.RoadwayNo); + //鎵樼洏鐮� + string barcode = string.Empty; + if (stockInfo != null) + { + barcode = stockInfo.PalletCode; } else { - throw new Exception("WCS澶勭悊澶辫触:" + respone.Message); + //鏃犲簱瀛樹俊鎭紝鐢熸垚闅忔満鎵樼洏鐮� + barcode = "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000); } - } - else - { - throw new Exception("璇锋眰澶勭悊澶辫触"); + + Dt_Task fireTask = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.OutFireAlarm && x.SourceAddress == locationInfo.LocationCode && x.Roadway == station.Roadway); + + if (fireTask != null) + { + throw new Exception("宸叉坊鍔犵伀璀﹀嚭搴撲换鍔�"); + } + + int taskNum = BaseDal.GetTaskNo().Result; + Dt_Task task = new Dt_Task + { + CreateDate = DateTime.Now, + Creater = "DTS", + CurrentAddress = locationInfo.LocationCode, + Grade = i == 0 ? 5 : 3, + Dispatchertime = DateTime.Now, + PalletCode = barcode, + Roadway = station.Roadway, + SourceAddress = locationInfo.LocationCode, + TaskState = (int)TaskOutStatusEnum.OutNew, + TaskType = (int)TaskOutboundTypeEnum.OutFireAlarm, + TargetAddress = station.stationLocation, + NextAddress = station.stationLocation, + TaskNum = taskNum, //_taskRepository.GetTaskNo().Result, + TaskId = 0, + }; + + // 灏濊瘯娣诲姞鏂颁换鍔� + WMSTaskDTO taskDTO = new WMSTaskDTO() + { + TaskNum = task.TaskNum.Value, + Grade = 1, + PalletCode = task.PalletCode, + RoadWay = task.Roadway, + SourceAddress = task.SourceAddress, + TargetAddress = task.TargetAddress, + TaskState = task.TaskState.Value, + Id = 0, + TaskType = task.TaskType, + }; + + var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress); + var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue; + var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSTask)?.ConfigValue; + if (ReceiveByWMSTask == null || ipAddress == null) + { + throw new Exception("WMS IP 鏈厤缃�"); + } + var wmsIpAddrss = ipAddress + ReceiveByWMSTask; + + var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTO)); + if (respon != null) + { + WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString()); + if (respone.Status) + { + var taskId = BaseDal.AddData(task); + } + else + { + throw new Exception("WCS澶勭悊澶辫触:" + respone.Message); + } + } + else + { + throw new Exception("璇锋眰澶勭悊澶辫触"); + } } LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, $"\r\r--------------------------------------"); LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, obj.ToJsonString()); -- Gitblit v1.9.3