From f546c6012b27a31a0c70089b6398c9ce935f2ce0 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 23 十一月 2024 14:56:54 +0800
Subject: [PATCH] 1
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 490 ++++++++++++++++++++++++++++--------------------------
1 files changed, 255 insertions(+), 235 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..fd86725 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
@@ -2,6 +2,8 @@
using Mapster;
using Masuit.Tools;
using Masuit.Tools.Models;
+using System.Linq;
+using System.Threading.Tasks;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IStorageBasicRepository;
@@ -10,10 +12,11 @@
using WIDESEA_StorageBasicRepository;
using WIDESEA_StorageTaskRepository;
using WIDESEA_StoragIntegrationServices;
+using WIDESEAWCS_BasicInfoRepository;
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;
@@ -36,6 +39,7 @@
private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
private readonly IAgingInOrOutInputService _agingInOrOutInputService; //闈欑疆\闄堝寲
private readonly IProductionRepository _productionRepository; //鐢熶骇
+ private readonly IDt_StationManagerRepository _stationManagerRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -57,7 +61,8 @@
IDt_AreaInfoRepository areaInfoRepository,
IAgingInOrOutInputService agingInOrOutInputService,
IStockInfoDetailRepository stockInfoDetailRepository,
- IProductionRepository productionRepository) : base(BaseDal)
+ IProductionRepository productionRepository,
+ IDt_StationManagerRepository stationManagerRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_outOrderRepository = outOrderRepository;
@@ -79,6 +84,7 @@
_agingInOrOutInputService = agingInOrOutInputService;
_stockInfoDetailRepository = stockInfoDetailRepository;
_productionRepository = productionRepository;
+ _stationManagerRepository = stationManagerRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -93,13 +99,15 @@
{
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 agingOutputDto = MapToAgingOutputDto(stock, info);
- content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
- ValidateResponse(content);
+ //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")) //闈炲垎瀹瑰簱鍖哄潎涓婃姤MOM鍑哄叆绔�
+ {
+ var agingOutputDto = MapToAgingOutputDto(stock);
+ content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
+ ValidateResponse(content);
+ }
}
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
@@ -123,31 +131,43 @@
}
}
- 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("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
+ }
+
+ var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos).FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
+ if (parameterInfo == null) throw new Exception("");
+
+ var outHours = (DateTime.Now - stock.OutboundTime.Value).TotalHours;
+ var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
+
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<ParameterInfoOutput> {
+ new ParameterInfoOutput() {
+ Value = outHours.ToString(),
+ ParameterCode =parameterInfo.ParameterCode,
+ ParameterDesc = parameterInfo.Description,
+ ParameterResult = isNG.ToString(),
+ TargetValue = parameterInfo.TargetValue,
+ LowerLomit = parameterInfo.LowerSpecificationsLimit,
+ UpperLimit = parameterInfo.UpperSpecificationsLimit,
+ }
+ }
}).ToList()
};
}
@@ -164,7 +184,7 @@
private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(DtStockInfo stock, Dt_Task task)
{
var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
+ //var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
location.LocationStatus = (int)LocationEnum.Free;
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
@@ -254,97 +274,33 @@
/// </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)
{
// 鍒濆鍖栧搷搴斿唴瀹�
WebResponseContent content = new WebResponseContent();
try
{
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ {
+ task.TaskState = (int)TaskInStatusEnum.SC_InFinish;
+ // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
+ var taskHtyNG = CreateHistoricalTask(task);
+
+ // 鎵ц鏁版嵁搴撲簨鍔�
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHtyNG) > 0;
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var isTaskDelete = await Delete(task.TaskId);
+ if (!isTaskHtyAdd || !isTaskDelete)
+ throw new Exception("娣诲姞澶辫触");
+ });
+ return content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ }
+
// 鑾峰彇瑁呯淇℃伅鍜岀洰鏍囦綅缃俊鎭�
var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
@@ -374,6 +330,7 @@
// 璁板綍寮傚父淇℃伅鍒版帶鍒跺彴鍜屾棩蹇�
Console.WriteLine(err.Message.ToString());
LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, err);
+ content.Error(err.Message);
}
return content;
}
@@ -383,6 +340,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 +349,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 +368,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 +383,8 @@
CreateDate = DateTime.Now,
Creater = "system",
IsFull = boxing.IsFull,
- AreaCode = task.Roadway,
+ AreaCode = area.AreaCode,
+ LocationId = loation.Id,
StockInfoDetails = boxDetail,
};
@@ -429,13 +396,18 @@
.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;
+ stock.ParameterInfos = respone.ParameterInfos.ToJsonString();
+ stock.StockStatus = 1;
// 璁板綍鏃ュ織
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
@@ -467,6 +439,11 @@
return content.Error("浠诲姟涓嶅瓨鍦�");
}
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉浠诲姟鏄惁瀛樺湪", JsonConvert.SerializeObject(task));
+
+ if(task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
+ {
+ return await CompleteInToOutTaskAsync(task);
+ }
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
@@ -527,13 +504,25 @@
return content.OK(data: taskDTO);
}
}
+
+
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
+ if (stock != null)
+ {
+ // TODO璐ㄦ鍥炲簱
+ }
+
+ 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鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
@@ -544,8 +533,25 @@
// 娣诲姞缁勭洏淇℃伅
// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- if (result.SerialNos.Count <= 0)
+ if (!result.Success)
return content.Error(result.MOMMessage);
+
+ // 鑾峰彇寮傚父鐢佃姱
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+ if (serialNosError.Count > 0)
+ {
+ // TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
+ List<string> NGStation = input.Position == "1088" ? new List<string>() { "1020" } : new List<string>() { "JZSC01" };
+ content = await CreateNewTask(input, NGStation, 2);
+ return content.Error("瀛樺湪寮傚父鐢佃姱");
+ }
+
+ if (result.SerialNos.Count <= 0)
+ {
+ // Todo 绌烘墭鐩樺叆搴撻�昏緫
+ content = await RequestTrayInTaskAsync(input);
+ return content;
+ }
// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
//var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
@@ -562,6 +568,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);
@@ -650,7 +662,6 @@
List<string> strings = input.Position == "1016" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
return await CreateNewTask(input, strings, 1);
- //return await CreateNewTask(input, null, 1);
}
catch (Exception)
{
@@ -690,46 +701,12 @@
// 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
return new ProcessApplyDto()
{
- EquipmentCode = "ECH001-B",
- Software = "WMS",
//WipOrderNo = result.BindCode,
SerialNos = content.SerialNos.Select(item => new SerialNos
{
SerialNo = item.SerialNo
}).ToList()
};
- }
-
- // 鑾峰彇宸ヨ壓鍝嶅簲
- private async Task<List<Dt_EquipmentProcess>> GetProcessResponseAsync(ProcessApplyDto process, string position)
- {
- // 濡傛灉process涓簄ull锛屽垯杩斿洖null
- if (process == null) return null;
-
- // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
- WebResponseContent content = await _processApplyService.GetProcessApplyAsync(process);
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
- if (!content.Status) return null;
-
- // 灏哻ontent.Data杞崲涓篟esultProcessApply瀵硅薄
- var apply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
- // 鏍规嵁position鐨勫�硷紝杩斿洖涓嶅悓鐨凞t_EquipmentProcess鍒楄〃
- switch (position)
- {
- case "1088":
- return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- .Where(x => x.EquipmentType == "闄堝寲" && x.WipOrderNo == apply.WipOrderNo || x.ProductDesc == apply.ProductNo)
- .ToList();
-
- case "1339":
- case "1406":
- return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- .Where(x => x.EquipmentType == "闈欑疆" && x.WipOrderNo == apply.WipOrderNo || x.ProductDesc == apply.ProductNo)
- .ToList();
-
- default:
- return new List<Dt_EquipmentProcess>();
- }
}
#endregion 璇锋眰浠诲姟鍏ュ簱
@@ -801,19 +778,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 +799,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 +877,7 @@
if (task == null)
return content.Error("鏈壘鍒颁换鍔�");
- if (taskState == (int)TaskOutStatusEnum.Line_OutFinish)
+ if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish)
{
var taskHty = CreateHistoricalTask(task);
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -1056,7 +1038,7 @@
/// <returns>鏄惁鏇存柊鎴愬姛</returns>
public async Task<bool> Update(Dt_Task model)
{
- return await BaseDal.Update(model);
+ return await BaseDal.UpdateDataAsync(model);
}
/// <summary>
@@ -1066,7 +1048,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 +1068,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 +1078,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 鍐呴儴璋冪敤鏂规硶
@@ -1186,12 +1168,13 @@
/// <param name="taskHty">鍘嗗彶浠诲姟瀵硅薄</param>
/// <param name="taskId">浠诲姟ID</param>
/// <returns></returns>
- private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId)
+ private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId, DtBoxingInfo boxingInfo = null)
{
_unitOfWorkManage.BeginTran();
try
{
var isUpdateStock = true;
+ var isDeleteBoxing = true;
if (taskHty.TaskType == (int)TaskTypeEnum.Outbound)
{
// 鏇存柊搴撳瓨
@@ -1201,6 +1184,9 @@
{
// 娣诲姞搴撳瓨
isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
+ isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
+ .Include(x => x.BoxingInfoDetails)
+ .ExecuteCommandAsync();
}
@@ -1215,7 +1201,7 @@
var isTaskDelete = await Delete(taskId);
// 鎻愪氦鎴栧洖婊氫簨鍔�
- if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
+ if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc && isDeleteBoxing)
{
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
_unitOfWorkManage.CommitTran();
@@ -1230,7 +1216,7 @@
}
catch (Exception err)
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"绉诲簱浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
_unitOfWorkManage.RollbackTran();
throw; // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
}
@@ -1238,54 +1224,87 @@
#region 浠诲姟璇锋眰鏂规硶
- /// <summary>
- /// 鏇存柊鐜版湁浠诲姟
- /// </summary>
- /// <param name="input">璇锋眰妯″瀷</param>
- /// <param name="areaId">鍖哄煙ID</param>
- /// <param name="task">浠诲姟瀹炰緥</param>
- /// <param name="content">鍝嶅簲鍐呭</param>
- /// <returns></returns>
+ // 鏇存柊浠诲姟璐т綅
+
private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
{
- // 鍒涘缓WebResponseContent瀵硅薄
- WebResponseContent content = new WebResponseContent();
- // 瀹氫箟鍙橀噺
- string toAddress;
- int taskState;
- string original = task.CurrentAddress;
- DtLocationInfo location = new DtLocationInfo();
- int beforeStatus = 0;
+ if (task == null)
+ {
+ return new WebResponseContent().Error("浠诲姟瀵硅薄涓虹┖");
+ }
- // 澶勭悊鍏ュ簱浠诲姟
- location = await GetLocationDistributeAsync(task.Roadway);
- toAddress = location.LocationCode;
- taskState = (int)TaskInStatusEnum.Line_InFinish;
- beforeStatus = location.LocationStatus;
+ try
+ {
+ // 鍒涘缓WebResponseContent瀵硅薄
+ var content = new WebResponseContent();
- // 鏇存柊璐т綅淇℃伅
- location.LocationStatus = (int)LocationEnum.Lock;
+ // 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ {
+ // TODO 鏍规嵁宸烽亾鏌ユ壘瀵瑰簲NG鍙ｏ紝鐜板湪榛樿鍘婚潤缃爢鍨涙満鐨勫紓甯稿彛璐т綅鍙�
+ task.CurrentAddress = input.Position;
+ task.TargetAddress = "002-021-000";
+ task.NextAddress = "002-021-000";
+ task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ bool isResult = await BaseDal.UpdateDataAsync(task);
+ return content.OK(data: task);
+ }
+ else
+ {
+ var location = await GetLocationDistributeAsync(task.Roadway);
+ if (location == null)
+ {
+ return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+ }
- // 鏇存柊浠诲姟淇℃伅
+ string toAddress = location.LocationCode;
+ int taskState = (int)TaskInStatusEnum.Line_InFinish;
+ int beforeStatus = location.LocationStatus;
+ // 鏇存柊璐т綅淇℃伅
+ location.LocationStatus = (int)LocationEnum.Lock;
+
+ // 鏇存柊浠诲姟淇℃伅
+ MapTaskProperties(task, input, toAddress, taskState);
+
+ // 寮�濮嬩簨鍔�
+ var isResult = await UpdateTaskAsync(task, location, beforeStatus);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏇存柊浠诲姟澶辫触");
+ }
+
+ // 鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ return content.OK(data: task);
+ }
+
+ }
+ catch (Exception ex)
+ {
+ // 鍥炴粴浜嬪姟
+ _unitOfWorkManage.RollbackTran();
+ // 杩欓噷鍙互娣诲姞鏃ュ織璁板綍
+ return new WebResponseContent().Error($"鏇存柊浠诲姟鏃跺彂鐢熼敊璇�: {ex.Message}");
+ }
+ }
+
+ private void MapTaskProperties(Dt_Task task, RequestTaskDto input, string toAddress, int taskState)
+ {
task.CurrentAddress = input.Position;
task.TargetAddress = toAddress;
task.NextAddress = toAddress;
task.TaskState = taskState;
+ }
- // 寮�濮嬩簨鍔�
- _unitOfWorkManage.BeginTran();
- // 瀹氫箟鍙橀噺
- bool isUpdateLo = true;
- bool isUpdateChange = true;
-
- // 灏濊瘯鏇存柊浠诲姟
+ // 淇敼浠诲姟
+ private async Task<bool> UpdateTaskAsync(Dt_Task task, DtLocationInfo location, int beforeStatus)
+ {
bool isResult = await BaseDal.UpdateDataAsync(task);
- bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
+ bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, task.CurrentAddress, task.TargetAddress, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
- // 鍒涘缓LocationChangeRecordDto瀵硅薄
LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
{
- // 璁剧疆鍙橀噺
AfterStatus = location.LocationStatus,
BeforeStatus = beforeStatus,
TaskNum = task.TaskNum.Value,
@@ -1293,23 +1312,11 @@
LocationCode = location.LocationCode,
ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
};
- // 鏇存柊浣嶇疆鐘舵��
- isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
- isUpdateLo = await _locationRepository.UpdateDataAsync(location);
- if (isResult && isUpdateLo && isTaskDetail)
- {
- // 鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- content.OK(data: task);
- }
- else
- {
- // 鍥炴粴浜嬪姟
- _unitOfWorkManage.RollbackTran();
- content.Error("鏇存柊浠诲姟澶辫触");
- }
- return content;
+ bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
+ bool isUpdateLo = await _locationRepository.UpdateDataAsync(location);
+
+ return isResult && isUpdateLo && isTaskDetail;
}
/// <summary>
@@ -1325,7 +1332,11 @@
// 鑾峰彇鐩爣鍦板潃
//string ToAddress = await GetRoadWayAsync(process);
- string ToAddress = await GetRoadWayAsync(input, process);
+ string ToAddress = string.Empty;
+ if (flag != 2)
+ ToAddress = await GetRoadWayAsync(input, process);
+ else
+ ToAddress = process[0];
// 鍒涘缓鏂颁换鍔″疄渚�
var task = new Dt_Task
@@ -1341,7 +1352,7 @@
PalletCode = input.PalletCode,
SourceAddress = input.Position,
TaskState = (int)TaskInStatusEnum.InNew,
- TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
+ TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : (int)TaskInboundTypeEnum.InNG,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
@@ -1363,7 +1374,7 @@
PalletCode = task.PalletCode,
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
- TargetAddress = task.Roadway,
+ TargetAddress = task.TargetAddress,
TaskState = task.TaskState.Value,
Id = 0,
TaskType = task.TaskType,
@@ -1381,16 +1392,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 +1438,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