From 2db8aa13565b87f9c92b94021b71020490a217de Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 20 十一月 2024 15:39:37 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 238 ++++++++++++++++++++++++-----------------------------------
1 files changed, 98 insertions(+), 140 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 7143a2d..181e0b0 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
@@ -13,7 +13,7 @@
namespace WIDESEA_StorageOutTaskServices;
-public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
+public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
private readonly LogFactory LogFactory = new LogFactory();
private readonly IUnitOfWorkManage _unitOfWorkManage;
@@ -93,11 +93,11 @@
{
if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- .FirstAsync(x => x.EquipmentName == task.Roadway);
- var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);
+ //var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
+ // .FirstAsync(x => x.EquipmentName == task.Roadway);
+ //var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);
- var agingOutputDto = MapToAgingOutputDto(stock, info);
+ var agingOutputDto = MapToAgingOutputDto(stock);
content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
ValidateResponse(content);
}
@@ -123,31 +123,37 @@
}
}
- private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info)
+ private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info = null)
{
// TODO Value鍊兼牴鎹甅OM涓嬪彂鐨勯潤缃椂闂村埌褰撳墠鏃堕棿鐨勫垎閽熸暟
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
+ if (area == null)
+ {
+ throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
+ }
return new AgingOutputDto
{
OpFlag = 1,
- Software = "WMS",
- EquipmentCode = "ECH001-B",
+ Software = area.Spare3,
+ EquipmentCode = area.Spare2,
TrayBarcode = stock.PalletCode,
SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto
{
SlotNo = x.OrderNo.ToInt32(),
SerialNo = x.SerialNumber,
SerialNoResult = true,
- ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()
- {
- LowerLomit = y.LowerControlLimit,
- UpperLimit = y.UpperControlLimit,
- ParameterResult = y.EquipmentAvailabilityFlag,
- ParameterCode = y.ParameterCode,
- ParameterDesc = y.Description,
- TargetValue = y.TargetValue,
- Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
- DefectCode = y.UOMCode
- }).ToList()
+ ParameterInfo = new List<ParameterInfo> { new ParameterInfo() { Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString() } }
+ //ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()
+ //{
+ // LowerLomit = y.LowerControlLimit,
+ // UpperLimit = y.UpperControlLimit,
+ // ParameterResult = y.EquipmentAvailabilityFlag,
+ // ParameterCode = y.ParameterCode,
+ // ParameterDesc = y.Description,
+ // TargetValue = y.TargetValue,
+ // Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
+ // DefectCode = y.UOMCode
+ //}).ToList()
}).ToList()
};
}
@@ -254,91 +260,6 @@
/// </summary>
/// <param name="task">浠诲姟鏁版嵁鍚堥泦</param>
/// <returns>杩斿洖缁撴灉闆�</returns>
- //public async Task<WebResponseContent> CompleteInboundTaskAsync(Dt_Task task)
- //{
- // WebResponseContent content = new WebResponseContent();
- // try
- // {
- // var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
- // var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
-
- // locationInf.LocationStatus = (int)LocationEnum.InStock;
-
- // // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
- // var taskHty = CreateHistoricalTask(task);
-
- // // 鍒涘缓搴撳瓨瀹炰緥妯″瀷
- // DtStockInfo stock;
- // if (boxing == null)
- // {
- // // 绌烘墭鐩�
-
- // stock = new DtStockInfo()
- // {
- // PalletCode = task.PalletCode,
- // LocationCode = task.TargetAddress,
- // CreateDate = DateTime.Now,
- // Creater = "system",
- // IsFull = boxing.IsFull,
- // StockInfoDetails = new List<DtStockInfoDetail>()
- // {
- // new DtStockInfoDetail()
- // {
- // MaterielCode = "绌烘墭鐩�",
- // Id = 0,
- // }
- // }
- // };
- // }
- // else
- // {
- // // 瀹炵洏
- // var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
- // // 鍒涘缓搴撳瓨瀹炰緥妯″瀷
- // stock = new DtStockInfo()
- // {
- // PalletCode = task.PalletCode,
- // LocationCode = task.TargetAddress,
- // CreateDate = DateTime.Now,
- // Creater = "system",
- // IsFull = boxing.IsFull,
- // StockInfoDetails = boxDetail,
- // };
-
- // AgingInputDto agingInputDto = new AgingInputDto()
- // {
- // SerialNos = boxing.BoxingInfoDetails
- // .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
- // .ToList(),
- // TrayBarcode = task.PalletCode,
- // OpFlag = 1
- // };
- // var result = await _agingInOrOutInputService.GetOCVInputAsync(agingInputDto);
- // stock.Remark = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString()).LinedProcessFeedbackTime;
-
- // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
-
- // }
-
- // // 鎵ц鏁版嵁搴撲簨鍔�
- // bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
- // if (isResult)
- // content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
- // else
- // content.Error("鍏ュ簱浠诲姟瀹屾垚澶辫触");
- // }
- // catch (Exception err)
- // {
- // Console.WriteLine(err.Message.ToString());
- // }
- // return content;
- //}
-
- /// <summary>
- /// 瀹屾垚鍏ュ簱浠诲姟
- /// </summary>
- /// <param name="task">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
public async Task<WebResponseContent> CompleteInboundTaskAsync(Dt_Task task)
{
// 鍒濆鍖栧搷搴斿唴瀹�
@@ -374,6 +295,7 @@
// 璁板綍寮傚父淇℃伅鍒版帶鍒跺彴鍜屾棩蹇�
Console.WriteLine(err.Message.ToString());
LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, err);
+ content.Error(err.Message);
}
return content;
}
@@ -383,6 +305,8 @@
/// </summary>
private DtStockInfo CreateEmptyPalletStock(Dt_Task task, DtLocationInfo locationInf)
{
+ var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
return new DtStockInfo()
{
PalletCode = task.PalletCode,
@@ -390,7 +314,8 @@
CreateDate = DateTime.Now,
Creater = "system",
IsFull = false,
- AreaCode = task.Roadway,
+ AreaCode = area.AreaCode,
+ LocationId = loation.Id,
StockInfoDetails = new List<DtStockInfoDetail>()
{
new DtStockInfoDetail()
@@ -408,6 +333,12 @@
/// </summary>
private DtStockInfo CreateFullPalletStock(Dt_Task task, DtLocationInfo locationInf, DtBoxingInfo boxing)
{
+ var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
+ if (loation == null)
+ throw new Exception("鏈壘鍒板搴斾綅缃俊鎭�");
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+ if (area == null)
+ throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
var stock = new DtStockInfo()
@@ -417,7 +348,8 @@
CreateDate = DateTime.Now,
Creater = "system",
IsFull = boxing.IsFull,
- AreaCode = task.Roadway,
+ AreaCode = area.AreaCode,
+ LocationId = loation.Id,
StockInfoDetails = boxDetail,
};
@@ -429,13 +361,16 @@
.ToList(),
TrayBarcode = task.PalletCode,
OpFlag = 1,
- EquipmentCode = "ECH001-B",
- Software = "WMS"
+ EquipmentCode = area.Spare2,
+ Software = area.Spare3
};
var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
stock.SpecialParameterDuration = respone.SpecialParameterDuration;
+ //2024骞�11鏈�16鏃ワ細鏂板瀛楁璁＄畻搴斿嚭搴撴椂闂�
+ stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
+ stock.ProductionLine = respone.ProductionLine;
// 璁板綍鏃ュ織
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
@@ -527,13 +462,18 @@
return content.OK(data: taskDTO);
}
}
+
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));
+ if (area == null)
+ return content.Error("鏀圭偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
+
// 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
{
- Software = "WMS",
+ Software = area.Spare3,
TrayBarcode = input.PalletCode,
//EquipmentCode = "EQ_CWJZ01"
- EquipmentCode = "ECH001-B"
+ EquipmentCode = area.Spare2
};
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
@@ -562,6 +502,12 @@
// 濡傛灉process涓簄ull锛屽垯杩斿洖content
if (process == null) return content;
+
+ // 骞惰祴鍊间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
+ process.Software = area.Spare3;
+ process.EquipmentCode = area.Spare2;
+
+ // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
// 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
content = await _processApplyService.GetProcessApplyAsync(process);
@@ -690,8 +636,6 @@
// 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
return new ProcessApplyDto()
{
- EquipmentCode = "ECH001-B",
- Software = "WMS",
//WipOrderNo = result.BindCode,
SerialNos = content.SerialNos.Select(item => new SerialNos
{
@@ -801,19 +745,19 @@
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)
{
- // TODO鏃堕棿鏍规嵁MOM绯荤粺閰嶇疆鐨勫嚭搴撴椂闂存潵鑾峰彇,鏆傛椂涓嶇煡閬揗OM杩斿洖鐨勬椂闂存槸浠�涔堟墍浠ヨ繖閲屾祴璇曟椂鍊欏湪鏀�
- //return _stockInfoRepository.QueryFirstNavAsync(x => x.AreaCode == areaCode && Convert.ToDateTime(x.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(x.SpecialParameterDuration)) < DateTime.Now
- // && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo) && x.StockInfoDetails.Any(x => x.Status == (int)StockStateEmun.宸插叆搴�) && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).Result;
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>().Where(x =>
- x.AreaCode == areaCode &&
- Convert.ToDateTime(x.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(x.SpecialParameterDuration)) < DateTime.Now)
- .Includes(x => x.LocationInfo)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))
- .Includes(x => x.StockInfoDetails)
- .Where(x => x.StockInfoDetails.Any(detail => detail.Status == (int)StockStateEmun.宸插叆搴�))
- .OrderBy(x => x.CreateDate)
- .FirstAsync();
+ 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) // 杩囨护鏉′欢
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+ .OrderBy(x => x.OutboundTime) // 鎺掑簭
+ .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
+
+ //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+ //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+ //return firstOrDefault;
return result;
}
@@ -822,14 +766,19 @@
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)
{
- //return _stockInfoRepository.QueryFirstNavAsync(x => x.StockInfoDetails.Any(x => x.MaterielCode == "绌烘墭鐩�") && roadways.Contains(x.LocationInfo.RoadwayNo) && x.StockInfoDetails.Any(x => x.Status == (int)StockStateEmun.宸插叆搴�) && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).Result;
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+
var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))
- .Includes(x => x.StockInfoDetails)
- .Where(x => x.StockInfoDetails.Any(detail => detail.Status == (int)StockStateEmun.宸插叆搴� && detail.MaterielCode == "绌烘墭鐩�"))
- .OrderBy(x => x.CreateDate)
- .FirstAsync();
+ .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
+ .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
+ .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) // 杩囨护鏉′欢
+ .OrderBy(x => x.CreateDate) // 鎺掑簭
+ .FirstAsync(); // 杞崲涓哄垪琛�
+
+ //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+ //return firstOrDefault;
return result;
}
@@ -895,7 +844,7 @@
if (task == null)
return content.Error("鏈壘鍒颁换鍔�");
- if (taskState == (int)TaskOutStatusEnum.Line_OutFinish)
+ if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskOutStatusEnum.SC_OutFinish)
{
var taskHty = CreateHistoricalTask(task);
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -1056,7 +1005,7 @@
/// <returns>鏄惁鏇存柊鎴愬姛</returns>
public async Task<bool> Update(Dt_Task model)
{
- return await BaseDal.Update(model);
+ return await BaseDal.UpdateDataAsync(model);
}
/// <summary>
@@ -1066,7 +1015,7 @@
/// <returns>鏄惁鏇存柊鎴愬姛</returns>
public async Task<bool> Update(List<Dt_Task> models)
{
- return await BaseDal.Update(models);
+ return await BaseDal.UpdateDataAsync(models);
}
/// <summary>
@@ -1086,7 +1035,7 @@
/// <returns></returns>
public async Task<Dt_Task> GetByLocation(string locationID)
{
- return await Db.Queryable<Dt_Task>().Where(x => x.SourceAddress == locationID).FirstAsync();
+ return await BaseDal.QueryFirstAsync(x => x.SourceAddress == locationID);
}
/// <summary>
@@ -1096,7 +1045,7 @@
/// <returns></returns>
public async Task<Dt_Task> GetByTaskNum(int taskNum)
{
- return await Db.Queryable<Dt_Task>().Where(x => x.TaskNum == taskNum).FirstAsync();
+ return await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
}
#endregion 鍐呴儴璋冪敤鏂规硶
@@ -1381,16 +1330,25 @@
/// <summary>
/// 鏌ユ壘璐т綅
/// </summary>
- /// <param name="areaId">鍖哄煙涓婚敭</param>
+ /// <param name="IsFull">鍖哄煙涓婚敭</param>
/// <param name="roadWay">宸烽亾</param>
/// <returns></returns>
- public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay)
+ public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay, bool IsFull = true)
{
#region 鑾峰彇璐т綅
try
{
- var locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ List<DtLocationInfo> locations;
+ if (IsFull)
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ }
+ else
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay /*&& x.LocationType ==*/);
+ }
+
if (locations == null)
{
return null;
@@ -1418,7 +1376,7 @@
public async Task<string> GetRoadWayAsync(RequestTaskDto input, List<string> process)
{
var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
- .GroupBy(x => x.RoadwayNo)
+ .GroupBy(x => x.RoadwayNo)
.OrderByDescending(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
.First(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
--
Gitblit v1.9.3