From 770531b9645ed712be426346148387f165d39773 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期一, 23 十二月 2024 17:25:45 +0800
Subject: [PATCH] 添加日志功能，更新SignalR接口，优化前端日志展示逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 508 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 413 insertions(+), 95 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 d6fe226..1764161 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,15 +1,13 @@
-锘�
-using Mapster;
+锘縰sing Mapster;
using Masuit.Tools;
+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_Services;
-using WIDESEA_StorageBasicRepository;
using WIDESEAWCS_BasicInfoRepository;
-using WIDESEAWCS_Model.Models;
namespace WIDESEA_StorageTaskServices;
@@ -71,7 +69,6 @@
#region 鍑哄簱浠诲姟瀹屾垚
-
public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
{
WebResponseContent content = new WebResponseContent();
@@ -82,13 +79,13 @@
//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)
+ if (!result.Success || !agingOutputDto.SerialNos[0].SerialNoResult)
{
task.Remark = "NG";
}
@@ -97,15 +94,20 @@
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
+ var taskHty = task.Adapt<Dt_Task_Hty>();
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
{
+ if (task.TaskType != (int)TaskOutboundTypeEnum.OutQuality)
+ {
+ await DeleteStockInfoAsync(stock.Id);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ }
await UpdateLocationAsync(loc);
- await DeleteStockInfoAsync(stock.Id);
- await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
- if (task.Roadway.Contains("FR") || task.Roadway.Contains("GW")) //濡傛灉鏄垎瀹规垨楂樻俯鍑哄簱 灏嗕换鍔″垹闄�
- await DeleteTaskAsync(task.TaskId);
+ //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);
@@ -154,17 +156,18 @@
{
SlotNo = x.OrderNo.ToInt32(),
SerialNo = x.SerialNumber,
- SerialNoResult = true,
+ 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,
- DefectCode = defectCode
+ DefectCode = defectCode,
+ UOMCode = parameterInfo.UOMCode,
}
}
}).ToList()
@@ -173,7 +176,6 @@
private void ValidateResponse(WebResponseContent content)
{
-
}
private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(DtStockInfo stock, Dt_Task task)
@@ -227,6 +229,15 @@
}
}
+ private async Task AddTaskHtyAsync(Dt_Task_Hty taskHty)
+ {
+ var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+ if (!isTaskAdd)
+ {
+ throw new Exception("鍘嗗彶浠诲姟淇℃伅娣诲姞澶辫触");
+ }
+ }
+
#endregion 鍑哄簱浠诲姟瀹屾垚
#region 绉诲簱浠诲姟瀹屾垚
@@ -242,12 +253,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
@@ -275,7 +286,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;
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
@@ -284,7 +295,6 @@
// 鎵ц鏁版嵁搴撲簨鍔�
await _unitOfWorkManage.UseTranAsync(async () =>
{
-
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHtyNG) > 0;
@@ -306,9 +316,15 @@
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
var taskHty = CreateHistoricalTask(task);
+ if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+ {
+ await _locationRepository.UpdateDataAsync(locationInf);
+ await _task_HtyRepository.AddDataAsync(taskHty);
+ await BaseDal.DeleteDataAsync(task);
+ return content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ }
// 鏍规嵁鏄惁鏈夌粍鐩樹俊鎭垱寤哄簱瀛樺疄渚嬫ā鍨�
DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);
-
// 鎵ц鏁版嵁搴撲簨鍔�
bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);
@@ -397,13 +413,31 @@
throw new Exception("鏈壘鍒板搴斾綅缃俊鎭�");
var area = new Dt_AreaInfo();
- var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
- if (station.stationPLC == "1017")
- area = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(station.stationNGLocation));
- else
+ if (task.Roadway.Contains("FR"))
+ {
area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
- if (area == null)
- throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
+ }
+ else
+ {
+ //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.宸插叆搴�; });
var stock = new DtStockInfo()
@@ -416,28 +450,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")
{
- 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;
+ // 澶勭悊璇锋眰鍙傛暟
+ 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());
+
+ 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}");
@@ -482,13 +539,19 @@
{
case (int)TaskInboundTypeEnum.Inbound:
case (int)TaskInboundTypeEnum.InTray:
+ case (int)TaskInboundTypeEnum.InNG:
+ case (int)TaskInboundTypeEnum.InQuality:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
return await CompleteInboundTaskAsync(task);
case (int)TaskOutboundTypeEnum.OutTray:
case (int)TaskOutboundTypeEnum.Outbound:
+ 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("浠诲姟绫诲瀷涓嶅瓨鍦�");
@@ -500,6 +563,7 @@
#region 璇锋眰浠诲姟鍏ュ簱
#region
+
/// <summary>
/// 璇锋眰浠诲姟宸烽亾
/// </summary>
@@ -534,7 +598,6 @@
return content.OK(data: taskDTO);
}
}
-
var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
if (stock != null)
@@ -687,18 +750,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;
}
@@ -730,7 +798,7 @@
return content;
}
- #endregion
+ #endregion 璇锋眰浠诲姟鍏ュ簱
public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
{
@@ -749,11 +817,35 @@
var stock = await QueryStockInfo(input.PalletCode);
if (stock != null)
{
+ Dt_Task taskNew = new Dt_Task
+ {
+ Grade = 1,
+ Roadway = stock.LocationInfo.RoadwayNo,
+ TargetAddress = stock.LocationInfo.RoadwayNo,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = stock.LocationInfo.RoadwayNo,
+ OrderNo = null,
+ PalletCode = stock.PalletCode,
+ SourceAddress = input.Position,
+ CurrentAddress = input.Position,
+ TaskState = stock.LocationInfo.RoadwayNo.Contains("CH") ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.Line_InFinish,
+ TaskType = (int)TaskInboundTypeEnum.InQuality,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ Creater = "System", // 淇鎷煎啓閿欒
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ };
+
+ var taskDTO = CreateTaskDTO(taskNew);
+ BaseDal.AddData(taskNew);
+ return content.OK(data: taskDTO);
// TODO璐ㄦ鍥炲簱
}
// 鏍规嵁浣嶇疆鏌ヨ鍖哄煙淇℃伅
- var area = await QueryAreaInfoByPosition(input.Position);
+ var areaCode = Regex.Replace(input.Position, @"-(\d+)", "");
+ var area = await QueryAreaInfoByPosition(areaCode);
if (area == null)
{
return content.Error("璇ョ偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
@@ -767,7 +859,21 @@
var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
if (!result.Success)
{
- return content.Error(result.MOMMessage);
+ if (result.SerialNos.Count <= 0)
+ {
+ // 绌烘墭鐩樺叆搴撻�昏緫
+ 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);
}
// 澶勭悊寮傚父鐢佃姱鎯呭喌
@@ -775,12 +881,6 @@
if (serialNosError.Count > 0)
{
return await HandleErrorCells(input, area, serialNosError);
- }
-
- if (result.SerialNos.Count <= 0)
- {
- // 绌烘墭鐩樺叆搴撻�昏緫
- return await RequestTrayInTaskAsync(input);
}
var boxing = CreateBoxingInfo(result, input.PalletCode);
@@ -797,6 +897,7 @@
return content;
}
+
/// <summary>
/// 鏇存柊浠诲姟璐т綅
/// </summary>
@@ -812,11 +913,9 @@
return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
return content = await UpdateExistingTask(input, task);
-
}
catch (Exception err)
{
-
throw;
}
}
@@ -831,7 +930,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)
@@ -852,7 +950,6 @@
return content.OK(data: task);
}
-
var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
if (stationManagers == null)
{
@@ -867,7 +964,6 @@
}
catch (Exception)
{
-
throw;
}
}
@@ -887,6 +983,7 @@
PalletCode = palletCode,
IsFull = true,
ProcessCode = result.ProcessCode,
+ ProductionLine = result.ProductionLine,
BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
{
SerialNumber = serialNoObj.SerialNo,
@@ -912,7 +1009,7 @@
};
}
- #endregion 璇锋眰浠诲姟鍏ュ簱
+ #endregion 澶栭儴鎺ュ彛鏂规硶
#region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
@@ -924,15 +1021,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;
+ ? areaCodes == null ? await QueryStockInfoForRealTrayAsync(areaCode, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine)
+ : await QueryStockInfoForEmptyTrayAsync(areaCode);
if (stockInfo == null)
{
@@ -979,7 +1076,7 @@
/// <summary>
/// 鏌ヨ瀹炵洏搴撳瓨淇℃伅
/// </summary>
- private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)
+ private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, string productionLine)
{
var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
@@ -987,6 +1084,29 @@
.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) // 杩囨护鏉′欢
+ .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) // 杩囨护鏉′欢
.OrderBy(x => x.OutboundTime) // 鎺掑簭
.FirstAsync(); // 鑾峰彇绗竴涓厓绱�
@@ -1000,7 +1120,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);
@@ -1036,7 +1156,7 @@
SourceAddress = stockInfo.LocationCode,
CurrentAddress = stockInfo.LocationCode,
TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = tag == (int)TaskOutboundTypeEnum.Outbound ? (int)TaskOutboundTypeEnum.Outbound : (int)TaskOutboundTypeEnum.OutTray,
+ TaskType = tag,
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "System", // 淇鎷煎啓閿欒
CreateDate = DateTime.Now,
@@ -1063,7 +1183,7 @@
};
}
- #endregion 璇锋眰鍑哄簱
+ #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
#region 浠诲姟鐘舵�佹洿鏀�
@@ -1113,25 +1233,191 @@
return content;
}
- #endregion
+ #endregion 浠诲姟鐘舵�佹洿鏀�
- #region 鍑哄簱瑙ｇ洏
+ #region 鎸囧畾浠诲姟鍑哄簱
- /// <summary>
- /// 鍑哄簱瑙ｇ洏鎺ュ彛
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> OutUnblockInterface(int taskNum)
+ public async Task<WebResponseContent> CreateAndSendOutboundTask(string locationCode, string palletCode)
{
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);
+ // 鏌ヨ搴撳瓨淇℃伅
+ var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.LocationCode == locationCode && x.PalletCode == palletCode);
+ if (stockInfo == null)
+ {
+ return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
+ }
+
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
+ if (task != null)
+ {
+ return content.Error($"銆恵palletCode}銆戝凡瀛樺湪浠诲姟");
+ }
+
+ int taskType = 0;
+ if (stockInfo.IsFull)
+ taskType = (int)TaskOutboundTypeEnum.OutQuality;
+ else
+ taskType = (int)TaskOutboundTypeEnum.OutTray;
+
+ 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)
+ //{
+ // return content.Error("浠诲姟鍒涘缓澶辫触");
+ //}
+
+ // 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
+ var taskDTO = CreateTaskDTO(task);
+
+ // 鑾峰彇WMS IP鍦板潃鐢ㄤ簬鍙戦�佷换鍔¤姹�
+ var wmsIpAddress = GetWCSIpReceiveTask();
+ if (wmsIpAddress == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+
+ var tasks = new List<WMSTaskDTO>() { taskDTO };
+ // 鍙戦�佷换鍔¤姹傚埌WMS
+ var result = await HttpHelper.PostAsync(wmsIpAddress, tasks.ToJsonString());
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (content.Status)
+ {
+ // 娣诲姞浠诲姟鍒版暟鎹簱
+ await BaseDal.AddDataAsync(task);
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鍙戠敓寮傚父: {ex.Message}");
+ content.Error(ex.Message);
+ }
+
+ return content;
+ }
+
+ private string GetWCSIpReceiveTask()
+ {
+ var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
+ var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;
+ if (wmsBase == null || ipAddress == null)
+ {
+ return null;
+ }
+ return wmsBase + ipAddress;
+ }
+
+ #endregion 鎸囧畾浠诲姟鍑哄簱
+
+ #region 闈欑疆寮傚父鍙ｅ叆搴�
+
+ public async Task<WebResponseContent> CreateAndSendInboundTask(string palletCode, string position)
+ {
+ 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.SerialNos.Count > 0)
+ {
+ 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);
+ });
+
+ content.OK(data: taskDTO);
+ }
+ else
+ content.Error(result.MOMMessage);
+ }
+ else
+ {
+ // TODO璐ㄦ鍥炲簱
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+ }
}
catch (Exception ex)
{
@@ -1140,7 +1426,7 @@
return content;
}
- #endregion
+ #endregion 闈欑疆寮傚父鍙ｅ叆搴�
#endregion 澶栭儴鎺ュ彛鏂规硶
@@ -1317,20 +1603,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>
@@ -1362,7 +1647,18 @@
.Include(x => x.BoxingInfoDetails)
.ExecuteCommandAsync();
}
+ }
+ var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
+ if (stocks != null && stocks.Count > 0)
+ {
+ foreach (var item in stocks)
+ {
+ 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);
}
// 娣诲姞鍘嗗彶浠诲姟
@@ -1413,12 +1709,30 @@
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鍙ｏ紝鐜板湪榛樿鍘婚潤缃爢鍨涙満鐨勫紓甯稿彛璐т綅鍙�
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 if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+ {
+ var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode);
+ task.CurrentAddress = input.Position;
+ task.TargetAddress = stockInfo.LocationInfo.LocationCode;
+ task.NextAddress = stockInfo.LocationInfo.LocationCode;
task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
bool isResult = await BaseDal.UpdateDataAsync(task);
return content.OK(data: task);
@@ -1452,7 +1766,6 @@
_unitOfWorkManage.CommitTran();
return content.OK(data: task);
}
-
}
catch (Exception ex)
{
@@ -1538,6 +1851,11 @@
{
task.TaskId = taskId;
isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
+
+ //var location = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
+ //location.LocationStatus = (int)LocationEnum.Lock;
+ //var isLocation = _locationRepository.UpdateData(location);
+
if (isResult)
{
// 鍒涘缓WMS浠诲姟
@@ -1612,7 +1930,7 @@
.OrderByDescending(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
.ToList(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
- Dictionary<string,int> result = new Dictionary<string,int>();
+ Dictionary<string, int> result = new Dictionary<string, int>();
foreach (var item in minGroup)
{
var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count();
--
Gitblit v1.9.3