From 15be9cdba09e832452983ad3badf7e6cbefae57d Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期五, 07 三月 2025 15:08:29 +0800
Subject: [PATCH] 增强业务扩展能力和错误处理逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 168 +++++---------------------------------------------------
1 files changed, 15 insertions(+), 153 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 9c82d44..9f34503 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1,6 +1,5 @@
锘縰sing Mapster;
using Masuit.Tools;
-using NewLife.Caching;
using SqlSugar;
using System.Text.RegularExpressions;
using WIDESEA_Cache;
@@ -82,86 +81,6 @@
{
if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- #region 鑰佺増鏈�
- //var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- // .FirstAsync(x => x.EquipmentName == task.Roadway);
- //var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);
- //if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB") //闈炲垎瀹瑰簱鍖轰笌褰撳墠宸ュ簭鏄疧CVB鍧囦笂鎶OM鍑哄叆绔�
- //{
- // var agingOutputDto = MapToAgingOutputDto(stock);
- // content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
- // //ValidateResponse(content);
- // var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
- // if (!result.Success || !agingOutputDto.SerialNos[0].SerialNoResult)
- // {
- // if (result.MessageCode == "E10001")
- // {
- // var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
- // if (area == null)
- // {
- // throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
- // }
- // var trayCells = new TrayCellsStatusDto()
- // {
- // Software = area.Spare3,
- // TrayBarcode = task.PalletCode,
- // EquipmentCode = area.Spare2,
- // SceneType = area.Spare4
- // };
- // content = await _cellStateService.GetTrayCellStatusAsync(trayCells);
- // if (!content.Status) return content;
-
- // var ResultTray = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- // if (ResultTray.SerialNos.Count > 0)
- // {
- // var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos).FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
- // if (parameterInfo == null) throw new Exception("");
-
- // var outHours = (DateTime.Now - (stock.LinedProcessFeedbackTime == null ? stock.CreateDate : stock.LinedProcessFeedbackTime.ToDateTime())).TotalHours;
-
- // var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
-
- // var defectCode = string.Empty;
- // if (!isNG) defectCode = "TQCK";
- // var outputDto = new AgingOutputDto
- // {
- // OpFlag = 1,
- // Software = area.Spare3,
- // EquipmentCode = area.Spare2,
- // TrayBarcode = stock.PalletCode,
- // SerialNos = ResultTray.SerialNos.Select(x => new SerialNoOutDto
- // {
- // SlotNo = x.PositionNo,
- // SerialNo = x.SerialNo,
- // SerialNoResult = true, //isNG,
- // ParameterInfo = new List<ParameterInfoOutput> {
- // new ParameterInfoOutput() {
- // Value = outHours.ToString(),
- // ParameterCode =parameterInfo.ParameterCode,
- // ParameterDesc = parameterInfo.Description,
- // ParameterResult = "OK", //isNG.ToString(),
- // TargetValue = parameterInfo.TargetValue,
- // LowerLomit = parameterInfo.LowerSpecificationsLimit,
- // UpperLimit = parameterInfo.UpperSpecificationsLimit,
- // DefectCode = defectCode,
- // UOMCode = parameterInfo.UOMCode,
- // }
- // }
- // }).ToList()
- // };
-
- // content = await _agingInOrOutInputService.GetOCVOutputAsync(outputDto);
- // result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
- // if (!result.Success)
- // task.Remark = "NG";
- // }
- // }
- // else
- // task.Remark = "NG";
- // }
- //}
- #endregion 鑰佺増鏈�
-
if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB")
@@ -216,6 +135,15 @@
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
+ try
+ {
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
+ }
+ catch (Exception ex)
+ {
+ LogFactory.GetLog("鍒犻櫎缂撳瓨澶辫触").Error(true, $"{stock.PalletCode}_鍒犻櫎缂撳瓨澶辫触锛屽紓甯镐俊鎭細{ex.Message}");
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
+ }
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
}
@@ -451,6 +379,7 @@
{
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
+ stock.StockInfoDetails = new List<DtStockInfoDetail>() { { stock.StockInfoDetails[0] } };
_simpleCacheService.HashAdd(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, stock.PalletCode, stock);
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
@@ -1286,67 +1215,6 @@
.OrderBy(x => x.OutboundTime)
.FirstOrDefault();
- if (result != null)
- {
- stockInfoList = stockInfoList.Where(x => x != result).ToList();
- _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
- }
-
- return result;
-
- if (stockInfoList.IsNullOrEmpty())
- {
- stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>().IncludesAllFirstLayer().ToListAsync();
-
- result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true)
- .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
- .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
- .OrderBy(x => x.OutboundTime) // 鎺掑簭
- .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
-
- if (result != null)
- {
- // 鎺掗櫎 result 涓殑鍏冪礌
- stockInfoList = stockInfoList.Where(x => x != result).ToList();
- }
- foreach (var item in stockInfoList)
- {
- _simpleCacheService.HashAdd(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, item.PalletCode, item);
- }
- }
- else
- {
- result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true)
- .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
- .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
- .OrderBy(x => x.OutboundTime) // 鎺掑簭
- .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
- if (result != null)
- {
- // 鎺掗櫎 result 涓殑鍏冪礌
- stockInfoList = stockInfoList.Where(x => x != result).ToList();
- }
- string[] xfasd = new string[] { result.PalletCode };
- _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
- }
-
- #region
- //var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- // .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- // .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
- // .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
- // .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
- // .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- // .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
- // .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
- // .OrderBy(x => x.OutboundTime) // 鎺掑簭
- // .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
- #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
-
return result;
}
@@ -1393,12 +1261,6 @@
.OrderBy(x => x.OutboundTime) // 鎺掑簭
.FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
- if (result != null)
- {
- stockInfoList = stockInfoList.Where(x => x != result).ToList();
- _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
- }
-
return result;
}
@@ -1431,11 +1293,11 @@
.OrderBy(x => x.CreateDate) // 鎺掑簭
.FirstOrDefault(); // 杞崲涓哄垪琛�
- if (result != null)
- {
- stockInfoList = stockInfoList.Where(x => x != result).ToList();
- _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
- }
+ //if (result != null)
+ //{
+ // stockInfoList = stockInfoList.Where(x => x != result).ToList();
+ // _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
+ //}
return result;
}
--
Gitblit v1.9.3