From a07e4702be045efa9b04b49a561463875dd28e0a Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 04 一月 2025 16:18:33 +0800
Subject: [PATCH] 更新配置文件和事件总线逻辑，修复任务处理逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 847 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 717 insertions(+), 130 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 19379e7..3b6a326 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,20 +1,19 @@
-锘�
-using AngleSharp.Io;
+锘縰sing AngleSharp.Dom;
using log4net.Core;
using Mapster;
using Masuit.Tools;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using SixLabors.Fonts.Tables.AdvancedTypographic;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
-using WIDESEA_Model.Models;
-using WIDESEA_Services;
using WIDESEA_StorageBasicRepository;
+using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;
-using WIDESEAWCS_Model.Models;
namespace WIDESEA_StorageTaskServices;
@@ -76,7 +75,6 @@
#region 鍑哄簱浠诲姟瀹屾垚
-
public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
{
WebResponseContent content = new WebResponseContent();
@@ -84,24 +82,118 @@
{
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")) //闈炲垎瀹瑰簱鍖哄潎涓婃姤MOM鍑哄叆绔�
+ //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)
{
- 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 (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB")
{
- task.Remark = "NG";
+ var agingOutputDto = MapToAgingOutputDto(stock);
+ content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
+
+ if (content.Status)
+ {
+ var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+ task.Remark = result.Success ? null : "NG";
+
+ if (!result.Success && result.MessageCode == "E10001")
+ {
+ await HandleOutBoundError(stock, task);
+ }
+ }
+ else
+ {
+ task.Remark = "NG";
+ }
}
}
}
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
+ var taskHty = task.Adapt<Dt_Task_Hty>();
+ taskHty.FinishTime = DateTime.Now;
+
+ DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfo_Hty.ModifyDate = DateTime.Now;
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -110,10 +202,11 @@
{
await DeleteStockInfoAsync(stock.Id);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await AddStockInfoHtyAsync(stockInfo_Hty);
}
await UpdateLocationAsync(loc);
- //if (task.Roadway.Contains("FR") || task.Roadway.Contains("GW") || task.TaskType == (int)TaskOutboundTypeEnum.OutTray) //濡傛灉鏄垎瀹规垨楂樻俯鍑哄簱 灏嗕换鍔″垹闄�
await DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
});
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
@@ -162,13 +255,13 @@
{
SlotNo = x.OrderNo.ToInt32(),
SerialNo = x.SerialNumber,
- SerialNoResult = isNG,
+ SerialNoResult = true, //isNG,
ParameterInfo = new List<ParameterInfoOutput> {
new ParameterInfoOutput() {
Value = outHours.ToString(),
ParameterCode =parameterInfo.ParameterCode,
ParameterDesc = parameterInfo.Description,
- ParameterResult = isNG.ToString(),
+ ParameterResult = "OK", //isNG.ToString(),
TargetValue = parameterInfo.TargetValue,
LowerLomit = parameterInfo.LowerSpecificationsLimit,
UpperLimit = parameterInfo.UpperSpecificationsLimit,
@@ -180,20 +273,17 @@
};
}
- private void ValidateResponse(WebResponseContent content)
- {
-
- }
-
private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(DtStockInfo stock, Dt_Task task)
{
var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
//var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
-
+ int lastStatus = location.LocationStatus;
location.LocationStatus = (int)LocationEnum.Free;
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
//task.CurrentAddress = task.NextAddress;
//task.NextAddress = task.TargetAddress;
+
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
LogFactory.GetLog("浠诲姟瀹屾垚").Info(true, "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
return (location, task);
@@ -205,6 +295,15 @@
if (!isStockUpdated)
{
throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task AddStockInfoHtyAsync(DtStockInfo_Hty dtStock)
+ {
+ var isStockAdd = await SqlSugarHelper.Db.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
+ if (!isStockAdd)
+ {
+ throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
}
}
@@ -236,6 +335,15 @@
}
}
+ private async Task AddTaskHtyAsync(Dt_Task_Hty taskHty)
+ {
+ var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+ if (!isTaskAdd)
+ {
+ throw new Exception("鍘嗗彶浠诲姟淇℃伅娣诲姞澶辫触");
+ }
+ }
+
#endregion 鍑哄簱浠诲姟瀹屾垚
#region 绉诲簱浠诲姟瀹屾垚
@@ -251,12 +359,12 @@
try
{
// 鏇存柊璐т綅鍜屽簱瀛樹俊鎭�
- (DtStockInfo updateStock, DtLocationInfo locationInf) = UpdateStockLocation(stock, task.NextAddress);
+ (DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
var taskHty = CreateHistoricalTask(task);
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInf}");
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInForm}");
// 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInf, task.TaskId);
+ bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInForm, locationInfoTo, task.TaskId);
if (isResult)
content.OK("绉诲簱浠诲姟瀹屾垚鎴愬姛");
else
@@ -284,7 +392,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG || task.TaskType == (int)TaskInboundTypeEnum.InQuality)
{
task.TaskState = (int)TaskInStatusEnum.SC_InFinish;
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
@@ -293,7 +401,6 @@
// 鎵ц鏁版嵁搴撲簨鍔�
await _unitOfWorkManage.UseTranAsync(async () =>
{
-
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHtyNG) > 0;
@@ -309,20 +416,32 @@
var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);
+ int lastStatus = locationInf.LocationStatus;
// 鏇存柊鐩爣浣嶇疆鐘舵�佷负搴撳瓨涓�
locationInf.LocationStatus = (int)LocationEnum.InStock;
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
var taskHty = CreateHistoricalTask(task);
+ if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+ {
+ await _locationRepository.UpdateDataAsync(locationInf);
+ await _task_HtyRepository.AddDataAsync(taskHty);
+ await BaseDal.DeleteDataAsync(task);
+
+ //璁板綍璐т綅鍙樺姩淇℃伅
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
+
+ return content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ }
// 鏍规嵁鏄惁鏈夌粍鐩樹俊鎭垱寤哄簱瀛樺疄渚嬫ā鍨�
DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);
-
// 鎵ц鏁版嵁搴撲簨鍔�
bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);
if (isResult)
{
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
}
else
@@ -412,15 +531,24 @@
}
else
{
- var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
- if (station.stationPLC == "1017")
- area = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(station.stationNGLocation));
+ //var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
+ //if (station.stationPLC == "1017")
+ // area = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(station.stationNGLocation));
+ //else
+ // area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+ //if (area == null)
+ // throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
+
+ if (boxing.ProcessCode == "OCV1")
+ area = _areaInfoRepository.QueryFirst(x => x.AreaID == 6);
+ else if (boxing.ProcessCode == "OCVB")
+ area = _areaInfoRepository.QueryFirst(x => x.AreaID == 7);
else
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.宸插叆搴�; });
@@ -434,29 +562,51 @@
AreaCode = area.AreaCode,
LocationId = loation.Id,
StockInfoDetails = boxDetail,
+ ProcessCode = boxing.ProcessCode,
+ NextProcessCode = boxing.NextProcessCode,
+ Remark = boxing.BoxingInfoDetails.Count().ToString(),
};
- // 澶勭悊璇锋眰鍙傛暟
- AgingInputDto agingInputDto = new AgingInputDto()
+ if (boxing.ProcessCode != "OCVB" && !task.Roadway.Contains("FR"))
{
- SerialNos = boxing.BoxingInfoDetails
- .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
- .ToList(),
- TrayBarcode = task.PalletCode,
- OpFlag = 1,
- EquipmentCode = area.Spare2,
- Software = area.Spare3
- };
+ // 澶勭悊璇锋眰鍙傛暟
+ AgingInputDto agingInputDto = new AgingInputDto()
+ {
+ SerialNos = boxing.BoxingInfoDetails
+ .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
+ .ToList(),
+ TrayBarcode = task.PalletCode,
+ OpFlag = 1,
+ 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 == null ? DateTime.Now : respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
- stock.ProductionLine = respone.ProductionLine;
- stock.ParameterInfos = respone.ParameterInfos.ToJsonString();
- stock.StockStatus = 1;
+ var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
+ var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
+
+ bool isFull = false;
+ if (!task.Roadway.Contains("FR"))
+ {
+ isFull = respone.SpecialParameterDuration.IsNullOrEmpty();
+ }
+ if (respone.ProductionLine == null || respone.ParameterInfos == null)
+ {
+ throw new Exception("MOM鏁版嵁杩斿洖閿欒");
+ }
+ stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
+ stock.SpecialParameterDuration = respone.SpecialParameterDuration;
+ //2024骞�11鏈�16鏃ワ細鏂板瀛楁璁＄畻搴斿嚭搴撴椂闂�
+ stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime == null ? DateTime.Now : respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
+ stock.ProductionLine = respone.ProductionLine;
+ stock.ParameterInfos = respone.ParameterInfos.ToJsonString();
+ stock.StockStatus = 1;
+ }
+ else
+ {
+ stock.OutboundTime = DateTime.Now;
+ stock.StockStatus = 1;
+ stock.ProductionLine = boxing.ProductionLine;
+ }
// 璁板綍鏃ュ織
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
@@ -502,6 +652,7 @@
case (int)TaskInboundTypeEnum.Inbound:
case (int)TaskInboundTypeEnum.InTray:
case (int)TaskInboundTypeEnum.InNG:
+ case (int)TaskInboundTypeEnum.InQuality:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
return await CompleteInboundTaskAsync(task);
@@ -510,6 +661,9 @@
case (int)TaskOutboundTypeEnum.OutNG:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
return await CompleteStackTaskAsync(task, stock);
+
+ case (int)TaskRelocationTypeEnum.Relocation:
+ return await CompleteTransferTaskAsync(task, stock);
default:
return content.Error("浠诲姟绫诲瀷涓嶅瓨鍦�");
@@ -521,6 +675,7 @@
#region 璇锋眰浠诲姟鍏ュ簱
#region
+
/// <summary>
/// 璇锋眰浠诲姟宸烽亾
/// </summary>
@@ -555,7 +710,6 @@
return content.OK(data: taskDTO);
}
}
-
var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
if (stock != null)
@@ -708,18 +862,23 @@
case "CH01":
areaIn = "CH001";
break;
+
case "JZ01":
areaIn = "JZ001";
break;
+
case "GW01":
areaIn = "GWSC1";
break;
+
case "CW01":
areaIn = "CWSC1";
break;
+
case "CW02":
areaIn = "CWSC2";
break;
+
default:
break;
}
@@ -751,7 +910,7 @@
return content;
}
- #endregion
+ #endregion 璇锋眰浠诲姟鍏ュ簱
public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
{
@@ -782,7 +941,7 @@
PalletCode = stock.PalletCode,
SourceAddress = input.Position,
CurrentAddress = input.Position,
- TaskState = (int)TaskInStatusEnum.InNew,
+ TaskState = stock.LocationInfo.RoadwayNo.Contains("CH") ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.InQuality,
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "System", // 淇鎷煎啓閿欒
@@ -790,12 +949,15 @@
TaskId = 0,
};
- var taskDTO = CreateTaskDTO(task);
+ var taskDTO = CreateTaskDTO(taskNew);
+ BaseDal.AddData(taskNew);
+ return content.OK(data: taskDTO);
// TODO璐ㄦ鍥炲簱
}
// 鏍规嵁浣嶇疆鏌ヨ鍖哄煙淇℃伅
- var area = await QueryAreaInfoByPosition(input.Position.Replace("-1", ""));
+ var areaCode = Regex.Replace(input.Position, @"-(\d+)", "");
+ var area = await QueryAreaInfoByPosition(areaCode);
if (area == null)
{
return content.Error("璇ョ偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
@@ -804,32 +966,55 @@
// 鍒涘缓骞惰幏鍙栨暣鐩樼數鑺姸鎬�
TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, input.PalletCode);
content = await GetTrayCellStatusAsync(trayCells);
- if (!content.Status) return content;
+ if (!content.Status)
+ {
+ ConsoleHelper.WriteErrorLine($"鑾峰彇鐢佃姱鐘舵�佸け璐�:{content.Message}");
+ return content;
+ }
var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+
if (!result.Success)
{
+ ConsoleHelper.WriteErrorLine($"鑾峰彇鐢佃姱鐘舵�佸け璐�:{result.MOMMessage}");
if (result.SerialNos.Count <= 0)
{
// 绌烘墭鐩樺叆搴撻�昏緫
- return await RequestTrayInTaskAsync(input);
+ var staion = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position && x.stationType == 1 && x.remark == "IN");
+ if (staion != null)
+ {
+ return await HandleErrorCells(input, area);
+ }
+ else
+ {
+ return await RequestTrayInTaskAsync(input);
+ }
}
else
return content.Error(result.MOMMessage);
}
- // 澶勭悊寮傚父鐢佃姱鎯呭喌
- var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
- if (serialNosError.Count > 0)
+
+ if (result.SerialNos.Count <= 0)
{
- return await HandleErrorCells(input, area, serialNosError);
+ return await RequestTrayInTaskAsync(input);
}
+ else
+ {
- var boxing = CreateBoxingInfo(result, input.PalletCode);
- if (boxing == null) return content.Error("缁勭洏澶辫触");
+ // 澶勭悊寮傚父鐢佃姱鎯呭喌
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
+ if (serialNosError.Count > 0)
+ {
+ return await HandleErrorCells(input, area, serialNosError);
+ }
- return await ProcessBasedOnProcessCode(boxing, area, input, result);
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+ return await ProcessBasedOnProcessCode(boxing, area, input, result);
+ }
}
catch (Exception err)
{
@@ -840,6 +1025,7 @@
return content;
}
+
/// <summary>
/// 鏇存柊浠诲姟璐т綅
/// </summary>
@@ -855,12 +1041,10 @@
return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
return content = await UpdateExistingTask(input, task);
-
}
catch (Exception err)
{
-
- throw;
+ return content.Error(err.Message);
}
}
@@ -874,7 +1058,6 @@
WebResponseContent content = new WebResponseContent();
try
{
-
// 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
if (task != null && task.TaskState == (int)TaskInStatusEnum.InNew)
@@ -895,7 +1078,6 @@
return content.OK(data: task);
}
-
var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
if (stationManagers == null)
{
@@ -910,7 +1092,6 @@
}
catch (Exception)
{
-
throw;
}
}
@@ -930,6 +1111,7 @@
PalletCode = palletCode,
IsFull = true,
ProcessCode = result.ProcessCode,
+ ProductionLine = result.ProductionLine,
BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
{
SerialNumber = serialNoObj.SerialNo,
@@ -955,7 +1137,7 @@
};
}
- #endregion 璇锋眰浠诲姟鍏ュ簱
+ #endregion 澶栭儴鎺ュ彛鏂规硶
#region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
@@ -967,15 +1149,15 @@
/// <param name="areaCode">鍖哄煙缂栫爜</param>
/// <param name="roadways">宸烽亾缂栫爜闆嗗悎</param>
/// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> roadways)
+ public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> areaCodes, string productionLine)
{
WebResponseContent content = new WebResponseContent();
try
{
// 鏍规嵁鎵樼洏绫诲瀷鏌ヨ搴撳瓨淇℃伅
DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
- ? QueryStockInfoForRealTrayAsync(areaCode, roadways).Result
- : QueryStockInfoForEmptyTrayAsync(areaCode, roadways).Result;
+ ? areaCode != "CWSC1" ? await QueryStockInfoForRealTrayAsync(areaCode, areaCodes, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine)
+ : await QueryStockInfoForEmptyTrayAsync(areaCode);
if (stockInfo == null)
{
@@ -1022,7 +1204,7 @@
/// <summary>
/// 鏌ヨ瀹炵洏搴撳瓨淇℃伅
/// </summary>
- private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)
+ private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> devices, string productionLine)
{
var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
@@ -1030,7 +1212,31 @@
.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) // 杩囨护鏉′欢
+ .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 firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+ //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+ //return firstOrDefault;
+ return result;
+ }
+
+ /// <summary>
+ /// 鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅
+ /// </summary>
+ private async Task<DtStockInfo> QueryStockInfoForRealTrayCWAsync(List<string> areaCodes, string productionLine)
+ {
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "CWSC1");
+
+ 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) // 杩囨护鏉′欢
+ .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) // 杩囨护鏉′欢
.OrderBy(x => x.OutboundTime) // 鎺掑簭
.FirstAsync(); // 鑾峰彇绗竴涓厓绱�
@@ -1043,7 +1249,7 @@
/// <summary>
/// 鏌ヨ绌虹洏搴撳瓨淇℃伅
/// </summary>
- private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)
+ private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode)
{
var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
@@ -1052,7 +1258,7 @@
.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) // 杩囨护鏉′欢
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
.OrderBy(x => x.CreateDate) // 鎺掑簭
.FirstAsync(); // 杞崲涓哄垪琛�
@@ -1068,7 +1274,7 @@
{
return new Dt_Task
{
- Grade = 1,
+ Grade = tag == 104 ? 2 : 1,
Roadway = stockInfo.LocationInfo.RoadwayNo,
TargetAddress = position,
Dispatchertime = DateTime.Now,
@@ -1095,7 +1301,7 @@
return new WMSTaskDTO
{
TaskNum = task.TaskNum.Value,
- Grade = 1,
+ Grade = task.Grade.Value,
PalletCode = task.PalletCode,
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
@@ -1106,7 +1312,7 @@
};
}
- #endregion 璇锋眰鍑哄簱
+ #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
#region 浠诲姟鐘舵�佹洿鏀�
@@ -1156,34 +1362,7 @@
return content;
}
- #endregion
-
- #region 鍑哄簱瑙ｇ洏
-
- /// <summary>
- /// 鍑哄簱瑙ｇ洏鎺ュ彛
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> OutUnblockInterface(int taskNum)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
- if (task == null)
- return content.Error("鏈壘鍒颁换鍔�");
- task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
- var taskHty = CreateHistoricalTask(task);
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- #endregion
+ #endregion 浠诲姟鐘舵�佹洿鏀�
#region 鎸囧畾浠诲姟鍑哄簱
@@ -1210,8 +1389,19 @@
taskType = (int)TaskOutboundTypeEnum.OutQuality;
else
taskType = (int)TaskOutboundTypeEnum.OutTray;
- // 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
- task = CreateTask(stockInfo, "1020-1", taskType);
+
+ if (stockInfo.AreaCode.Contains("CH"))
+ {
+ // 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
+ task = CreateTask(stockInfo, "1020-1", taskType);
+ }
+ else
+ {
+ if (stockInfo.LocationInfo.RoadwayNo == "JZSC1")
+ {
+ task = CreateTask(stockInfo, "002-021-001", taskType);
+ }
+ }
//var taskId = await BaseDal.AddDataAsync(task);
//if (taskId <= 0)
//{
@@ -1249,6 +1439,7 @@
return content;
}
+
private string GetWCSIpReceiveTask()
{
var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
@@ -1261,7 +1452,280 @@
return wmsBase + ipAddress;
}
- #endregion
+ #endregion 鎸囧畾浠诲姟鍑哄簱
+
+ #region 闈欑疆寮傚父鍙ｅ叆搴�
+
+ public async Task<WebResponseContent> CreateAndSendInboundTask(string palletCode, string position)
+ {
+ #region
+ //WebResponseContent content = new WebResponseContent();
+ //try
+ //{
+ // // 鏌ヨ搴撳瓨淇℃伅
+ // var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ // if (stockInfo == null)
+ // {
+ // var taskOld = BaseDal.QueryFirst(x => x.PalletCode == palletCode);
+ // if (!taskOld.IsNullOrEmpty())
+ // {// 鍒涘缓WMS浠诲姟
+ // WMSTaskDTO taskDTO = new WMSTaskDTO()
+ // {
+ // TaskNum = taskOld.TaskNum.Value,
+ // Grade = 1,
+ // PalletCode = taskOld.PalletCode,
+ // RoadWay = taskOld.Roadway,
+ // SourceAddress = taskOld.CurrentAddress,
+ // TargetAddress = taskOld.TargetAddress,
+ // TaskState = taskOld.TaskState.Value,
+ // Id = 0,
+ // TaskType = taskOld.TaskType,
+ // };
+ // return content.OK(data: taskDTO);
+ // }
+ // var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+ // var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == position);
+ // TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, palletCode);
+ // content = await GetTrayCellStatusAsync(trayCells);
+ // if (!content.Status) return content;
+
+ // ConsoleHelper.WriteErrorLine(content.ToJsonString());
+ // var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ // if (!result.Success) return content.Error(result.MOMMessage);
+
+ // if (result.SerialNos.Count > 0)
+ // {
+ // var boxing = CreateBoxingInfo(result, palletCode);
+ // if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+ // // 鑾峰彇宸ヨ壓璺嚎
+ // ProcessApplyDto process = await GetProcessApplyAsync(result);
+ // // 璧嬪�间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
+ // process.Software = area.Spare3;
+ // process.EquipmentCode = area.Spare2;
+ // content = await _processApplyService.GetProcessApplyAsync(process);
+ // if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+ // var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
+ // if (!resultProcessApply.Success) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+ // var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode.Contains(boxing.ProcessCode)).FirstOrDefault().Number.ToInt32();
+ // foreach (var item in resultProcessApply.ProcessInfo)
+ // {
+ // if (item.Number.ToInt32() == number + 1)
+ // {
+ // boxing.NextProcessCode = item.ProcessCode;
+ // }
+ // }
+ // var location = await GetLocationDistributeAsync(station.Roadway);
+
+ // ConsoleHelper.WriteErrorLine(location.ToJsonString());
+
+ // // 鍒涘缓鏂颁换鍔″疄渚�
+ // var task = new Dt_Task
+ // {
+ // CurrentAddress = station.stationLocation,
+ // Grade = 1,
+ // Roadway = station.Roadway,
+ // TargetAddress = location.LocationCode,
+ // Dispatchertime = DateTime.Now,
+ // MaterialNo = "",
+ // NextAddress = location.LocationCode,
+ // OrderNo = null,
+ // PalletCode = palletCode,
+ // SourceAddress = position,
+ // TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ // TaskType = (int)TaskInboundTypeEnum.Inbound,
+ // TaskNum = await BaseDal.GetTaskNo(),
+ // Creater = "Systeam"
+ // };
+
+ // // 鍒涘缓WMS浠诲姟
+ // WMSTaskDTO taskDTO = new WMSTaskDTO()
+ // {
+ // TaskNum = task.TaskNum.Value,
+ // Grade = 1,
+ // PalletCode = task.PalletCode,
+ // RoadWay = task.Roadway,
+ // SourceAddress = task.SourceAddress,
+ // TargetAddress = task.TargetAddress,
+ // TaskState = task.TaskState.Value,
+ // Id = 0,
+ // TaskType = task.TaskType,
+ // };
+
+ // await _unitOfWorkManage.UseTranAsync(async () =>
+ // {
+ // // 娣诲姞浠诲姟鍒版暟鎹簱
+ // await BaseDal.AddDataAsync(task);
+ // // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ // location.LocationStatus = (int)LocationEnum.InStockDisable;
+ // await _locationRepository.UpdateDataAsync(location);
+ // await _boxingInfoRepository.AddDataNavAsync(boxing);
+ // });
+
+ // content.OK(data: taskDTO);
+ // }
+ // else
+ // content.Error(result.MOMMessage);
+ // }
+ // else
+ // {
+ // // TODO璐ㄦ鍥炲簱
+ // var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // content.Error(ex.Message);
+ //}
+ //return content;
+ #endregion
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ // 鏌ヨ搴撳瓨淇℃伅
+ var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ if (stockInfo == null)
+ {
+ var taskOld = BaseDal.QueryFirst(x => x.PalletCode == palletCode);
+ if (taskOld != null)
+ {
+ // 鍒涘缓WMS浠诲姟
+ WMSTaskDTO taskDTO = CreateWMSTaskDTO(taskOld);
+ return content.OK(data: taskDTO);
+ }
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == position);
+ TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, palletCode);
+ content = await GetTrayCellStatusAsync(trayCells);
+ if (!content.Status) return content;
+
+ ConsoleHelper.WriteErrorLine(content.ToJsonString());
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (result == null || !result.Success) return content.Error(result?.MOMMessage ?? "Deserialization error");
+
+ if (result.SerialNos.Count > 0)
+ {
+ var boxing = CreateBoxingInfo(result, palletCode);
+ if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+ // 鑾峰彇宸ヨ壓璺嚎
+ ProcessApplyDto process = await GetProcessApplyAsync(result);
+ // 璧嬪�间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
+ process.Software = area.Spare3;
+ process.EquipmentCode = area.Spare2;
+
+ content = await _processApplyService.GetProcessApplyAsync(process);
+ if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+ var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString()) as ResultProcessApply;
+ if (resultProcessApply == null || !resultProcessApply.Success) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+ var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode.Contains(boxing.ProcessCode)).FirstOrDefault()?.Number.ToInt32() ?? 0;
+ foreach (var item in resultProcessApply.ProcessInfo)
+ {
+ if (item.Number.ToInt32() == number + 1)
+ {
+ boxing.NextProcessCode = item.ProcessCode;
+ }
+ }
+ var location = await GetLocationDistributeAsync(station.Roadway);
+
+ ConsoleHelper.WriteErrorLine(location.ToJsonString());
+
+ // 鍒涘缓鏂颁换鍔″疄渚�
+ var task = new Dt_Task
+ {
+ CurrentAddress = station.stationLocation,
+ Grade = 1,
+ Roadway = station.Roadway,
+ TargetAddress = location.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = location.LocationCode,
+ OrderNo = null,
+ PalletCode = palletCode,
+ SourceAddress = position,
+ TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ TaskType = (int)TaskInboundTypeEnum.Inbound,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+
+ // 鍒涘缓WMS浠诲姟
+ WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
+
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ // 娣诲姞浠诲姟鍒版暟鎹簱
+ await BaseDal.AddDataAsync(task);
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ location.LocationStatus = (int)LocationEnum.Lock;
+ await _locationRepository.UpdateDataAsync(location);
+ await _boxingInfoRepository.AddDataNavAsync(boxing);
+ });
+
+ content.OK(data: taskDTO);
+ }
+ else
+ content.Error(result.MOMMessage);
+ }
+ else
+ {
+ // TODO璐ㄦ鍥炲簱
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+ }
+ }
+ catch (Exception ex)
+ {
+ // 鏇磋缁嗙殑鏃ュ織璁板綍锛屽彲浣跨敤鏃ュ織妗嗘灦鏇挎崲 Console.WriteLine
+ Console.WriteLine($"Error in CreateAndSendInboundTask: {ex.Message}");
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+
+ private WMSTaskDTO CreateWMSTaskDTO(object source)
+ {
+ if (source is Dt_Task taskOld)
+ {
+ return new WMSTaskDTO()
+ {
+ TaskNum = taskOld.TaskNum.Value,
+ Grade = 1,
+ PalletCode = taskOld.PalletCode,
+ RoadWay = taskOld.Roadway,
+ SourceAddress = taskOld.CurrentAddress,
+ TargetAddress = taskOld.TargetAddress,
+ TaskState = taskOld.TaskState.Value,
+ Id = 0,
+ TaskType = taskOld.TaskType,
+ };
+ }
+ else if (source is Dt_Task task)
+ {
+ return new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.TargetAddress,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = task.TaskType,
+ };
+ }
+ else
+ {
+ throw new ArgumentException("Invalid source object type for WMSTaskDTO creation.");
+ }
+ }
+
+ #endregion 闈欑疆寮傚父鍙ｅ叆搴�
#endregion 澶栭儴鎺ュ彛鏂规硶
@@ -1305,6 +1769,35 @@
public async Task<bool> Delete(List<int> ids)
{
return await BaseDal.Delete(ids);
+ }
+
+ public override WebResponseContent DeleteData(object[] key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(key[0]));
+ if (task == null)
+ {
+ return content.Error("鏈壘鍒颁换鍔′俊鎭�!");
+ }
+ var taskHtyNG = CreateHistoricalTask(task, true);
+
+ // 鎵ц鏁版嵁搴撲簨鍔�
+
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = _task_HtyRepository.AddData(taskHtyNG) > 0;
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var isTaskDelete = BaseDal.Delete(task.TaskId);
+
+ return content.OK("鍒犻櫎鎴愬姛!");
+ }
+ catch (Exception ex)
+ {
+ return content.Error("鍒犻櫎浠诲姟寮傚父锛�" + ex.Message);
+ }
}
/// <summary>
@@ -1416,7 +1909,7 @@
/// </summary>
/// <param name="task"></param>
/// <returns></returns>
- private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
+ private Dt_Task_Hty CreateHistoricalTask(Dt_Task task, bool isHand = false)
{
// 鏇存柊浠诲姟鐘舵��
task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
@@ -1426,7 +1919,7 @@
var taskHty = _mapper.Map<Dt_Task_Hty>(task);
taskHty.FinishTime = DateTime.Now;
taskHty.TaskId = 0;
- taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.OperateType = isHand ? (int)OperateTypeEnum.浜哄伐鍒犻櫎 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.SourceId = task.TaskId;
taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
return taskHty;
@@ -1438,20 +1931,19 @@
/// <param name="stock">搴撳瓨瀵硅薄</param>
/// <param name="toLocation">鐩爣浣嶇疆</param>
// 鏇存柊搴撳瓨鍜屼綅缃俊鎭�
- private (DtStockInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, string toLocation)
+ private (DtStockInfo, DtLocationInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, Dt_Task task)
{
- // 鑾峰彇搴撳瓨淇℃伅
- var locationInfo = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
- // 灏嗗簱瀛樼姸鎬佽缃负鍦ㄥ簱
- locationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
+ //淇敼鏉ユ簮搴撲綅鍜� 鐩爣搴撲綅鐘舵��
+ var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
+ fromLocation.LocationStatus = LocationEnum.Free.ObjToInt();
+ var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
+ toLocation.LocationStatus = LocationEnum.InStock.ObjToInt();
// 灏嗗簱瀛樹綅缃缃负鐩爣浣嶇疆
- stock.LocationCode = toLocation;
- // 灏嗗簱瀛樼姸鎬佽缃负鍦ㄥ簱
- stock.LocationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
+ stock.LocationCode = task.TargetAddress;
// 杩斿洖鏇存柊鍚庣殑搴撳瓨鍜屼綅缃俊鎭�
- return (stock, locationInfo);
+ return (stock, fromLocation, toLocation);
}
/// <summary>
@@ -1483,7 +1975,6 @@
.Include(x => x.BoxingInfoDetails)
.ExecuteCommandAsync();
}
-
}
var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
@@ -1546,6 +2037,13 @@
var content = new WebResponseContent();
// 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
+
+ input.Position = Regex.Replace(input.Position, @"-(\d+)", "");
+ if (Convert.ToInt32(input.Position) > 1999)
+ {
+ input.Position = (Convert.ToInt32(input.Position) - 1000).ToString();
+ }
+
if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
{
// TODO 鏍规嵁宸烽亾鏌ユ壘瀵瑰簲NG鍙ｏ紝鐜板湪榛樿鍘婚潤缃爢鍨涙満鐨勫紓甯稿彛璐т綅鍙�
@@ -1558,7 +2056,7 @@
}
else if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
{
- var stockInfo = _stockInfoRepository.QueryFirst(x => x.PalletCode == input.PalletCode);
+ var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode);
task.CurrentAddress = input.Position;
task.TargetAddress = stockInfo.LocationInfo.LocationCode;
task.NextAddress = stockInfo.LocationInfo.LocationCode;
@@ -1595,7 +2093,6 @@
_unitOfWorkManage.CommitTran();
return content.OK(data: task);
}
-
}
catch (Exception ex)
{
@@ -1711,6 +2208,8 @@
return content;
}
+
+ private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
/// <summary>
/// 鏌ユ壘璐т綅
/// </summary>
@@ -1721,16 +2220,17 @@
{
#region 鑾峰彇璐т綅
+ await _semaphore.WaitAsync();
try
{
List<DtLocationInfo> locations;
if (IsFull)
{
- locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay && x.EnalbeStatus == (int)EnableEnum.Enable);
}
else
{
- locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay /*&& x.LocationType ==*/);
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay && x.EnalbeStatus == (int)EnableEnum.Enable);
}
if (locations == null)
@@ -1744,6 +2244,10 @@
{
Console.WriteLine(err.Message.ToString());
return null;
+ }
+ finally
+ {
+ _semaphore.Release();
}
#endregion 鑾峰彇璐т綅
@@ -1795,6 +2299,89 @@
return minRoadwayNo;
}
+ // 鏂扮殑鍑哄簱閿欒澶勭悊閫昏緫
+ private async Task HandleOutBoundError(DtStockInfo stock, Dt_Task task)
+ {
+ WebResponseContent content = new WebResponseContent();
+ 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;
+
+ var ResultTray = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (ResultTray.SerialNos.Count > 0)
+ {
+ var parameterInfo = GetParameterInfo(stock);
+
+ var outHours = CalculateOutHours(stock);
+ var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble()
+ && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
+
+ var defectCode = !isNG ? "TQCK" : string.Empty;
+
+ var outputDto = CreateAgingOutputDto(area, stock, ResultTray, parameterInfo, outHours, defectCode);
+ content = await _agingInOrOutInputService.GetOCVOutputAsync(outputDto);
+
+ var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+ if (!result.Success)
+ task.Remark = "NG";
+ }
+ }
+
+ // 璁＄畻鍑哄簱灏忔椂鐨勬柟娉�
+ private double CalculateOutHours(DtStockInfo stock) =>
+ (DateTime.Now - Convert.ToDateTime(stock.LinedProcessFeedbackTime ?? stock.CreateDate.ToString())).TotalHours;
+
+ // 鐢熸垚 AgingOutputDto 鐨勫皝瑁呮柟娉�
+ private AgingOutputDto CreateAgingOutputDto(Dt_AreaInfo area, DtStockInfo stock, ResultTrayCellsStatus resultTray,
+ ParameterInfo parameterInfo, double outHours, string defectCode)
+ {
+ return 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,
+ ParameterInfo = new List<ParameterInfoOutput>
+ {
+ new ParameterInfoOutput
+ {
+ Value = outHours.ToString(),
+ ParameterCode = parameterInfo.ParameterCode,
+ ParameterDesc = parameterInfo.Description,
+ ParameterResult = "OK",
+ TargetValue = parameterInfo.TargetValue,
+ LowerLomit = parameterInfo.LowerSpecificationsLimit,
+ UpperLimit = parameterInfo.UpperSpecificationsLimit,
+ DefectCode = defectCode,
+ }
+ }
+ }).ToList()
+ };
+ }
+
+ // 鑾峰彇鍙傛暟淇℃伅鐨勮緟鍔╂柟娉�
+ private ParameterInfo GetParameterInfo(DtStockInfo stock) =>
+ JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos)
+ .FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
+
#endregion 浠诲姟璇锋眰鏂规硶
#endregion private 鍐呴儴鏂规硶
--
Gitblit v1.9.3