From a610ca9e97f456a7e87cb407bf6e353672472ec5 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期五, 07 三月 2025 13:49:44 +0800
Subject: [PATCH] 修复组件属性并更新路由配置
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 238 +++++++++++++++++++++++++----------------------------------
1 files changed, 101 insertions(+), 137 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 b1cda0a..3ca6613 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,7 +1,8 @@
-锘縰sing Autofac.Core;
-using Mapster;
+锘縰sing Mapster;
using Masuit.Tools;
+using SqlSugar;
using System.Text.RegularExpressions;
+using WIDESEA_Cache;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
@@ -9,7 +10,6 @@
using WIDESEA_IStoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_QuartzJob.Models;
-
namespace WIDESEA_StorageTaskServices;
@@ -31,6 +31,7 @@
private readonly IAgingInOrOutInputService _agingInOrOutInputService; //闈欑疆\闄堝寲
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
+ private readonly ISimpleCacheService _simpleCacheService;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -48,7 +49,8 @@
IAgingInOrOutInputService agingInOrOutInputService,
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService) : base(BaseDal)
+ ISys_ConfigService configService,
+ ISimpleCacheService simpleCacheService) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -65,6 +67,7 @@
_stockInfoDetailRepository = stockInfoDetailRepository;
_stationManagerRepository = stationManagerRepository;
_configService = configService;
+ _simpleCacheService = simpleCacheService;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -78,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")
@@ -194,6 +117,7 @@
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
var taskHty = task.Adapt<Dt_Task_Hty>();
taskHty.FinishTime = DateTime.Now;
+ taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
stockInfo_Hty.ModifyDate = DateTime.Now;
@@ -211,6 +135,8 @@
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
+
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
}
@@ -445,6 +371,10 @@
if (isResult)
{
_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("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
}
else
@@ -895,7 +825,7 @@
List<string> strings = stationManagers.Roadway.Split(',').ToList();
Console.WriteLine(strings.ToJsonString() + "b-----------------------");
//// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = await CreateNewTask(input, result.ProductionLine,result.ProcessCode, strings);
+ content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
if (content.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -999,7 +929,6 @@
else
return content.Error(result.MOMMessage);
}
-
if (result.SerialNos.Count <= 0)
{
@@ -1117,7 +1046,6 @@
return content.Error("褰撳墠鎵樼洏鏃犱骇绾�,鑱旂郴MOM娣诲姞浜х嚎");
}
-
var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
if (stationManagers == null)
{
@@ -1127,7 +1055,7 @@
}
List<string> strings = stationManagers.Roadway.Split(',').ToList();
- return await CreateNewTask(input, result.ProductionLine, result.ProcessCode,strings, 1);
+ return await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 1);
}
catch (Exception)
{
@@ -1205,7 +1133,6 @@
//ConsoleHelper.WriteColorLine(JsonConvert.SerializeObject(stockInfo), ConsoleColor.DarkMagenta);
-
// 鏂板閲嶅浠诲姟鏍￠獙
var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
if (hasTask != null)
@@ -1250,20 +1177,37 @@
private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> devices, string productionLine)
{
var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+ if (area == null)
+ {
+ ConsoleHelper.WriteErrorLine($"鏌ヨ瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{areaCode}鐨勬暟鎹�");
+ return null;
+ }
- 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))
- .OrderBy(x => x.OutboundTime) // 鎺掑簭
- .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
+ var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ List<string>? materielCodes = outBoundMateriel.Count != 0
+ ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == area.AreaCode)
+ .Select(x => x.MaterielCode)
+ .ToList()
+ : null;
- //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return firstOrDefault;
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+ var result = new DtStockInfo();
+
+ //if (stockInfoList.IsNullOrEmpty())
+ //{
+ // stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ // .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).IncludesAllFirstLayer().ToListAsync();
+ //}
+
+ result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)
+ .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();
+
return result;
}
@@ -1279,25 +1223,37 @@
return null;
}
- var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
- .Where(x => x.DeviceStatus == "1")
- .Where(x => x.DeviceRemark == "1")
- .ToList();
- var deviceCode = devices.Select(x => x.DeviceCode).ToList();
+ //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ //List<string> materielCodes = null;
+ //if (outBoundMateriel.Count != 0)
+ //{
+ // materielCodes = outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0]).Select(x => x.MaterielCode).ToList();
+ //}
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
- .Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+ var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ List<string>? materielCodes = outBoundMateriel.Count != 0
+ ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0])
+ .Select(x => x.MaterielCode)
+ .ToList()
+ : null;
+
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => x.DeviceCode.Contains("CWSC"))
+ .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 = stockInfoList.Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
.WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && areaId.Contains(x.LocationInfo.AreaId) && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
.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(); // 鑾峰彇绗竴涓厓绱�
+ .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
- //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return firstOrDefault;
return result;
}
@@ -1314,27 +1270,28 @@
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 == station.productLine)
+ var result = stockInfoList.Where(x => x.ProductionLine == station.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))
.OrderBy(x => x.CreateDate) // 鎺掑簭
- .FirstAsync(); // 杞崲涓哄垪琛�
+ .FirstOrDefault(); // 杞崲涓哄垪琛�
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return 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;
}
@@ -1661,7 +1618,7 @@
// content.Error(ex.Message);
//}
//return content;
- #endregion
+ #endregion 闈欑疆寮傚父鍙ｅ叆搴�
WebResponseContent content = new WebResponseContent();
try
{
@@ -1733,7 +1690,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = result.ProductionLine,
- ProcessCode=result.ProcessCode,
+ ProcessCode = result.ProcessCode,
};
// 鍒涘缓WMS浠诲姟
@@ -1803,7 +1760,6 @@
return content;
}
-
private WMSTaskDTO CreateWMSTaskDTO(object source)
{
if (source is Dt_Task taskOld)
@@ -1847,8 +1803,6 @@
#endregion 闈欑疆寮傚父鍙ｅ叆搴�
#endregion 澶栭儴鎺ュ彛鏂规硶
-
-
#region 鍐呴儴璋冪敤鏂规硶
@@ -2033,7 +1987,7 @@
private Dt_Task_Hty CreateHistoricalTask(Dt_Task task, bool isHand = false)
{
// 鏇存柊浠诲姟鐘舵��
- task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
+ task.TaskState = task.TaskType > 199 ? (int)TaskInStatusEnum.InFinish : (int)TaskOutStatusEnum.OutFinish;
task.CurrentAddress = task.NextAddress;
// 鍒涘缓鍘嗗彶浠诲姟
@@ -2046,7 +2000,7 @@
{
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
}
- taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
+ taskHty.TaskState = task.TaskType > 199 ? (int)TaskInStatusEnum.InFinish : (int)TaskOutStatusEnum.OutFinish;
return taskHty;
}
@@ -2104,16 +2058,28 @@
if (stock.IsFull)
{
+ // 鏌ヨ绗﹀悎鏉′欢鐨勫簱瀛樹俊鎭�
var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
+
+ // 鏌ヨ浠诲姟淇℃伅
+ var tasks = BaseDal.QueryData(x => x.PalletCode != stock.PalletCode && x.ProductionLine == stock.ProductionLine).Select(x => x.PalletCode).ToList();
+
if (stocks != null && stocks.Count > 0)
{
- foreach (var item in stocks)
+ // 杩囨护鍑洪渶瑕佹洿鏂扮殑搴撳瓨淇℃伅
+ var stocksToUpdate = stocks.Where(item => !tasks.Contains(item.PalletCode)).ToList();
+ foreach (var item in stocksToUpdate)
{
+ // 鏇存柊搴撳瓨淇℃伅鐨勭壒瀹氬弬鏁�
item.SpecialParameterDuration = stock.SpecialParameterDuration;
item.ParameterInfos = stock.ParameterInfos;
item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
}
- var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocks);
+ if (stocksToUpdate.Count > 0)
+ {
+ // 寮傛鏇存柊搴撳瓨淇℃伅
+ var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocksToUpdate);
+ }
}
}
@@ -2149,7 +2115,6 @@
}
#region 浠诲姟璇锋眰鏂规硶
-
private static readonly SemaphoreSlim _semaphoreUpdate = new SemaphoreSlim(1, 1);
// 鏇存柊浠诲姟璐т綅
@@ -2237,7 +2202,6 @@
}
catch (Exception)
{
-
throw;
}
finally { _semaphoreUpdate.Release(); }
@@ -2351,8 +2315,8 @@
return content;
}
-
private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+
/// <summary>
/// 鏌ユ壘璐т綅
/// </summary>
--
Gitblit v1.9.3