From 457b75b642a1fdaa7158e5b047cabc5d7ae16333 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期一, 10 三月 2025 10:10:13 +0800
Subject: [PATCH] 修复和优化 Dt_TaskService.cs 中的任务请求逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 148 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 102 insertions(+), 46 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 28c4737..528d7af 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
@@ -1,7 +1,6 @@
锘縰sing Masuit.Tools;
+using SqlSugar;
using WIDESEA_Common.CustomModels;
-
-//using WIDESEA_Common.CustomModels;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
@@ -199,7 +198,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -226,7 +225,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System"
};
return taskNG;
}
@@ -258,7 +257,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -292,7 +291,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -370,7 +369,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -420,7 +419,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = stationManager.stationType == 1 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -459,6 +458,10 @@
else
{
locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Distribute && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ if (locations == null)
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ }
}
if (locations == null)
@@ -537,12 +540,14 @@
{
if (stationManager.stationType != 7) throw new Exception("閿欒鐨勮皟鍙�");
- var stockinfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo)
- //.Includes(x=>x.StockInfoDetails)
- .Where(x => !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway)
- .OrderBy(x => x.CreateDate)
- .FirstAsync();
+ // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
+ 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();
if (stockinfo == null) return null;
@@ -561,10 +566,10 @@
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = (int)TaskOutboundTypeEnum.OutTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = stockinfo.ProductionLine,
};
-
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { task.PalletCode });
return task;
}
catch (Exception ex)
@@ -656,7 +661,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -718,7 +723,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.Inbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -800,14 +805,21 @@
{
try
{
- Thread.Sleep(10000);
+ Thread.Sleep(TimeSpan.FromMinutes(10));
+
var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1");
+ var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => x.DeviceCode.Contains("GWSC"))
+ .ToList();
+ var deviceCode = devices.Select(x => x.DeviceCode).ToList();
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) // 杩囨护鏉′欢
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
.OrderBy(x => x.OutboundTime) // 鎺掑簭
.ToListAsync(); // 鑾峰彇绗竴涓厓绱�
@@ -874,11 +886,34 @@
#region 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
+ private static readonly Dictionary<string, (int Count, DateTime LastRequestTime)> requestTrackerToCW = new();
+
public async Task<WebResponseContent> GetFROutTrayToCW(RequestTaskDto taskDTO)
{
WebResponseContent content = new WebResponseContent();
try
{
+ //string requestKey = JsonConvert.SerializeObject(taskDTO);
+ //// 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
+ //if (requestTrackerToCW.TryGetValue(requestKey, out var requestInfo))
+ //{
+ // if (requestInfo.Count > 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(2))
+ // {
+ // // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
+ // throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
+ // }
+ //}
+
+ //// 鏇存柊璇锋眰璺熻釜淇℃伅
+ //if (requestTrackerToCW.ContainsKey(requestKey))
+ //{
+ // requestTrackerToCW[requestKey] = (requestInfo.Count + 1, DateTime.Now);
+ //}
+ //else
+ //{
+ // requestTrackerToCW[requestKey] = (1, DateTime.Now);
+ //}
+
var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position && x.stationStatus == "1");
var locations = _locationRepository.QueryData(x => x.RoadwayNo == station.Roadway && x.LocationStatus == (int)LocationEnum.Free && x.LocationType == 1);
@@ -911,6 +946,8 @@
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
// 杩斿洖鎴愬姛鍝嶅簲
+ //requestTrackerToCW.Remove(requestKey);
+
return content.OK(data: wmsTask);
}
else
@@ -937,32 +974,39 @@
ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
var stackers = station.Roadway.Split(',').ToList();
- var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
.Where(x => x.DeviceStatus == "1")
.Where(x => stackers.Contains(x.DeviceCode))
- .ToList();
+ .ToList().Select(x => x.DeviceCode).ToList();
- var deviceCode = devices.Select(x => x.DeviceCode).ToList();
+ // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
- .Where(x => x.ProductionLine == productLine)
+ var result1 = stockInfoList.Where(x => x.ProductionLine == productLine)
.Where(x => x.AreaCode == areaCode && x.IsFull == false)
- .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))
.OrderBy(x => x.CreateDate) // 鎺掑簭
- .FirstAsync(); // 杞崲涓哄垪琛�
+ .ToList(); // 杞崲涓哄垪琛�
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return 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
+ ConsoleHelper.WriteColorLine($"甯告俯{productLine}绌烘墭鐩樺簱瀛樹笉瓒�", ConsoleColor.Red);
+
return result;
}
#endregion
#region 甯告俯3鍑哄簱鑷冲寘瑁�
+
+ // 鐢ㄤ簬杩借釜姣忎釜璇锋眰鐨勮皟鐢ㄦ鏁板拰鏈�鍚庤姹傛椂闂淬��
+ private static readonly Dictionary<string, (int Count, DateTime LastRequestTime)> requestTracker = new();
/// <summary>
/// 甯告俯3鍑哄簱鑷冲寘瑁�
@@ -974,22 +1018,32 @@
WebResponseContent content = new WebResponseContent();
try
{
-
- //LogFactory.GetLog("甯告俯3鍑哄簱鑷冲寘瑁�").Info(true, $"甯告俯3鍑哄簱鑷冲寘瑁呬紶鍏ュ弬鏁帮細" + JsonConvert.SerializeObject(json, Formatting.Indented));
-
Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call");
- if(station == null) { throw new Exception($"鏈壘鍒板寘瑁呯珯鍙颁俊鎭紝璇锋鏌ヤ紶鍏ュ弬鏁皗json.Position}"); }
+ if (station == null) { throw new Exception($"鏈壘鍒板寘瑁呯珯鍙颁俊鎭紝璇锋鏌ヤ紶鍏ュ弬鏁皗json.Position}"); }
- //LogFactory.GetLog("甯告俯3鍑哄簱鑷冲寘瑁�").Info(true, $"甯告俯3鍑哄簱鑷冲寘瑁呬紶鍏ュ弬鏁帮細" + JsonConvert.SerializeObject(json, Formatting.Indented));
- var stockInfo = _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Where(x => x.ProductionLine == station.productLine)
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true) // 杩囨护鏉′欢
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock) // 杩囨护鏉′欢
- .OrderBy(x => x.OutboundTime) // 鎺掑簭
- .First(); // 鑾峰彇绗竴涓厓绱�
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => x.DeviceCode.Contains("CWSC")) // 杩囨护鏉′欢
+ .ToList().Select(x => x.DeviceCode).ToList();
- //DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(X => X.IsFull && X.AreaCode == "CWSC3" && X.ProductionLine == station.productLine);
+ // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+
+ // 淇敼鍚庣殑鏌ヨ浠ｇ爜
+ 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))
+ .FirstOrDefault();
+
if (stockInfo == null) throw new Exception($"搴撳唴{station.productLine}鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�");
DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.AreaId == 5 && x.LocationCode == stockInfo.LocationCode);
@@ -1012,7 +1066,7 @@
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = (int)TaskOutboundTypeEnum.Outbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = stockInfo.ProductionLine,
ProcessCode = stockInfo.ProcessCode,
};
@@ -1025,6 +1079,8 @@
stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
_locationRepository.UpdateData(stockInfo.LocationInfo);
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode });
+
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(stockInfo.LocationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
return content.OK(data: taskDTO);
--
Gitblit v1.9.3