From a610ca9e97f456a7e87cb407bf6e353672472ec5 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期五, 07 三月 2025 13:49:44 +0800
Subject: [PATCH] 修复组件属性并更新路由配置
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 1162 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 924 insertions(+), 238 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 9e9e3ef..3ca6613 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1,20 +1,15 @@
-锘�
-using AngleSharp.Io;
-using log4net.Core;
-using Mapster;
+锘縰sing Mapster;
using Masuit.Tools;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
-using SixLabors.Fonts.Tables.AdvancedTypographic;
+using SqlSugar;
+using System.Text.RegularExpressions;
+using WIDESEA_Cache;
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 WIDESEAWCS_BasicInfoRepository;
-using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob.Models;
namespace WIDESEA_StorageTaskServices;
@@ -36,6 +31,7 @@
private readonly IAgingInOrOutInputService _agingInOrOutInputService; //闈欑疆\闄堝寲
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
+ private readonly ISimpleCacheService _simpleCacheService;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -53,7 +49,8 @@
IAgingInOrOutInputService agingInOrOutInputService,
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService) : base(BaseDal)
+ ISys_ConfigService configService,
+ ISimpleCacheService simpleCacheService) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -70,12 +67,12 @@
_stockInfoDetailRepository = stockInfoDetailRepository;
_stationManagerRepository = stationManagerRepository;
_configService = configService;
+ _simpleCacheService = simpleCacheService;
}
#region 澶栭儴鎺ュ彛鏂规硶
#region 鍑哄簱浠诲姟瀹屾垚
-
public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
{
@@ -84,25 +81,46 @@
{
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);
- if (!task.Roadway.Contains("FR")) //闈炲垎瀹瑰簱鍖哄潎涓婃姤MOM鍑哄叆绔�
+ 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());
+
+ if (!result.Success && result.MessageCode == "E10001")
+ {
+ await HandleOutBoundError(stock, task);
+ }
+ }
+ else
+ {
+ task.Remark = "NG";
+ ConsoleHelper.WriteErrorLine("MOM閫氭姤鐐硅姱NG");
+ return content.Error("MOM閫氭姤鐐硅姱NG");
+ }
}
}
+ }
+
+ if (task.Remark == "NG")
+ {
+ ConsoleHelper.WriteErrorLine("MOM閫氭姤鐐硅姱NG");
+ return content.Error("MOM閫氭姤鐐硅姱NG");
}
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
var taskHty = task.Adapt<Dt_Task_Hty>();
+ taskHty.FinishTime = DateTime.Now;
+ taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+
+ DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfo_Hty.ModifyDate = DateTime.Now;
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -111,12 +129,14 @@
{
await DeleteStockInfoAsync(stock.Id);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await AddStockInfoHtyAsync(stockInfo_Hty);
+ await UpdateLocationAsync(loc); //璐ㄦ浠诲姟闇�瑕佹寔缁攣瀹氬簱浣�
}
- await UpdateLocationAsync(loc);
- //if (task.Roadway.Contains("FR") || task.Roadway.Contains("GW") || task.TaskType == (int)TaskOutboundTypeEnum.OutTray) //濡傛灉鏄垎瀹规垨楂樻俯鍑哄簱 灏嗕换鍔″垹闄�
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
+
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
}
@@ -164,15 +184,15 @@
{
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,
+ LowerLimit = parameterInfo.LowerSpecificationsLimit,
UpperLimit = parameterInfo.UpperSpecificationsLimit,
DefectCode = defectCode,
UOMCode = parameterInfo.UOMCode,
@@ -182,20 +202,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);
@@ -207,6 +224,15 @@
if (!isStockUpdated)
{
throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task AddStockInfoHtyAsync(DtStockInfo_Hty dtStock)
+ {
+ var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
+ if (!isStockAdd)
+ {
+ throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
}
}
@@ -262,12 +288,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
@@ -295,7 +321,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;
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
@@ -304,7 +330,6 @@
// 鎵ц鏁版嵁搴撲簨鍔�
await _unitOfWorkManage.UseTranAsync(async () =>
{
-
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHtyNG) > 0;
@@ -320,20 +345,36 @@
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);
+
+ stock.StockInfoDetails = new List<DtStockInfoDetail>() { { stock.StockInfoDetails[0] } };
+ _simpleCacheService.HashAdd(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, stock.PalletCode, stock);
+
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
}
else
@@ -367,6 +408,7 @@
IsFull = false,
AreaCode = area.AreaCode ?? "",
LocationId = loation.Id,
+ ProductionLine = task.ProductionLine,
StockInfoDetails = new List<DtStockInfoDetail>()
{
new DtStockInfoDetail()
@@ -423,15 +465,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.宸插叆搴�; });
@@ -445,29 +496,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}");
@@ -513,6 +586,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);
@@ -521,6 +595,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("浠诲姟绫诲瀷涓嶅瓨鍦�");
@@ -532,6 +609,7 @@
#region 璇锋眰浠诲姟鍏ュ簱
#region
+
/// <summary>
/// 璇锋眰浠诲姟宸烽亾
/// </summary>
@@ -567,7 +645,6 @@
}
}
-
var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
if (stock != null)
{
@@ -599,7 +676,7 @@
return content.Error(result.MOMMessage);
// 鑾峰彇寮傚父鐢佃姱
- List<SerialNoDto>? serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+ List<SerialNoDto>? serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
if (serialNosError.Count > 0)
{
// TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
@@ -614,7 +691,7 @@
{
NGStation = efg.Select(x => x.stationNGChildCode).ToList();
}
- content = await CreateNewTask(input, NGStation, 2);
+ content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, NGStation, 2);
return content.Error("瀛樺湪寮傚父鐢佃姱");
}
@@ -651,7 +728,7 @@
{
// TODO 閫佽嚦鍖呰
List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
- content = await CreateNewTask(input, strings, 3);
+ content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 3);
return content;
}
else
@@ -659,7 +736,7 @@
var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
var strings = config.ConfigValue.Split(',').ToList();
// TODO 鍏ュ簱
- content = await CreateNewTask(input, strings);
+ content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
if (content.Status)
await _boxingInfoRepository.AddDataNavAsync(boxing);
}
@@ -719,18 +796,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;
}
@@ -743,7 +825,7 @@
List<string> strings = stationManagers.Roadway.Split(',').ToList();
Console.WriteLine(strings.ToJsonString() + "b-----------------------");
//// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = await CreateNewTask(input, strings);
+ content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
if (content.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -762,7 +844,7 @@
return content;
}
- #endregion
+ #endregion 璇锋眰浠诲姟鍏ュ簱
public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
{
@@ -793,20 +875,25 @@
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", // 淇鎷煎啓閿欒
CreateDate = DateTime.Now,
TaskId = 0,
+ ProductionLine = stock.ProductionLine,
+ ProcessCode = stock.ProcessCode,
};
- 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("璇ョ偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
@@ -815,32 +902,62 @@
// 鍒涘缓骞惰幏鍙栨暣鐩樼數鑺姸鎬�
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);
+ var config = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStacker, SysConfigConst.InboundIsEmpty);
+ var strings = config.ConfigValue.Split(',').ToList();
+ if (strings.Contains(input.Position))
+ {
+ // todo閫佽嚦NG鍙�
+ ConsoleHelper.WriteErrorLine($"褰撳墠浣嶇疆涓嶈兘鍏ョ┖鎵樼洏");
+ return content.Error("褰撳墠浣嶇疆涓嶈兘鍏ョ┖鎵樼洏");
+ }
+ else
+ return await RequestTrayInTaskAsync(input);
}
+ else
+ {
+ // 澶勭悊寮傚父鐢佃姱鎯呭喌
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
+ if (serialNosError.Count > 0)
+ {
+ return await HandleErrorCells(input, area, serialNosError);
+ }
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ if (boxing == null) return content.Error("缁勭洏澶辫触");
- var boxing = CreateBoxingInfo(result, input.PalletCode);
- if (boxing == null) return content.Error("缁勭洏澶辫触");
-
- return await ProcessBasedOnProcessCode(boxing, area, input, result);
+ input.ProductionLine = result.ProductionLine;
+ return await ProcessBasedOnProcessCode(boxing, area, input, result);
+ }
}
catch (Exception err)
{
@@ -851,6 +968,7 @@
return content;
}
+
/// <summary>
/// 鏇存柊浠诲姟璐т綅
/// </summary>
@@ -866,12 +984,10 @@
return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
return content = await UpdateExistingTask(input, task);
-
}
catch (Exception err)
{
-
- throw;
+ return content.Error(err.Message);
}
}
@@ -885,27 +1001,50 @@
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)
{
// 鍒涘缓WMS浠诲姟
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TaskNum = task.TaskNum.Value,
- Grade = 1,
- PalletCode = task.PalletCode,
- RoadWay = task.Roadway,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.Roadway,
- TaskState = task.TaskState.Value,
- Id = 0,
- TaskType = task.TaskType,
- };
+ WMSTaskDTO taskDTO = CreateTaskDTO(task);
+ //WMSTaskDTO taskDTO = new WMSTaskDTO()
+ //{
+ // TaskNum = task.TaskNum.Value,
+ // Grade = 1,
+ // PalletCode = task.PalletCode,
+ // RoadWay = task.Roadway,
+ // SourceAddress = task.SourceAddress,
+ // TargetAddress = task.Roadway,
+ // TaskState = task.TaskState.Value,
+ // Id = 0,
+ // TaskType = task.TaskType,
+ //};
return content.OK(data: task);
}
+ // 鏍规嵁浣嶇疆鏌ヨ鍖哄煙淇℃伅
+ var areaCode = Regex.Replace(input.Position, @"-(\d+)", "");
+ var area = await QueryAreaInfoByPosition(areaCode);
+ if (area == null)
+ {
+ return content.Error("璇ョ偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
+ }
+
+ // 鑾峰彇鏁寸洏鐢佃姱灞炴�х姸鎬�
+ TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, input.PalletCode);
+ content = await GetTrayCellStatusAsync(trayCells);
+ if (!content.Status)
+ {
+ ConsoleHelper.WriteErrorLine($"鑾峰彇鐢佃姱鐘舵�佸け璐�:{content.Message}");
+ return content;
+ }
+
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (result.ProductionLine.IsNullOrEmpty())
+ {
+ ConsoleHelper.WriteErrorLine($"褰撳墠鎵樼洏鏃犱骇绾�,鑱旂郴MOM娣诲姞浜х嚎");
+ return content.Error("褰撳墠鎵樼洏鏃犱骇绾�,鑱旂郴MOM娣诲姞浜х嚎");
+ }
var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
if (stationManagers == null)
@@ -915,13 +1054,11 @@
throw new Exception("鏈壘鍒扮┖鎵樼洏鍏ュ簱绔欏彴鍜屽叆搴撶珯鍙伴厤缃�");
}
List<string> strings = stationManagers.Roadway.Split(',').ToList();
- Console.WriteLine(strings.ToJsonString() + "b-----------------------");
- return await CreateNewTask(input, strings, 1);
+ return await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 1);
}
catch (Exception)
{
-
throw;
}
}
@@ -941,6 +1078,7 @@
PalletCode = palletCode,
IsFull = true,
ProcessCode = result.ProcessCode,
+ ProductionLine = result.ProductionLine,
BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
{
SerialNumber = serialNoObj.SerialNo,
@@ -966,7 +1104,7 @@
};
}
- #endregion 璇锋眰浠诲姟鍏ュ簱
+ #endregion 澶栭儴鎺ュ彛鏂规硶
#region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
@@ -978,20 +1116,22 @@
/// <param name="areaCode">鍖哄煙缂栫爜</param>
/// <param name="roadways">宸烽亾缂栫爜闆嗗悎</param>
/// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, string productionLine)
+ 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, productionLine).Result
- : QueryStockInfoForEmptyTrayAsync(areaCode).Result;
+ ? areaCode != "CWSC1" ? await QueryStockInfoForRealTrayAsync(areaCode, areaCodes, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine)
+ : await QueryStockInfoForEmptyTrayAsync(areaCode, position);
if (stockInfo == null)
{
return content.Error("搴撳瓨淇℃伅涓嶅瓨鍦�");
}
+
+ //ConsoleHelper.WriteColorLine(JsonConvert.SerializeObject(stockInfo), ConsoleColor.DarkMagenta);
// 鏂板閲嶅浠诲姟鏍￠獙
var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
@@ -1026,6 +1166,7 @@
{
// 璁板綍寮傚父淇℃伅骞舵姏鍑�
LogFactory.GetLog("璇锋眰鎵樼洏浠诲姟").Error(true, ex);
+ ConsoleHelper.WriteErrorLine("璇锋眰绌�/瀹炴墭鐩樹换鍔�" + ex.Message);
return content.Error(ex.Message);
}
}
@@ -1033,43 +1174,124 @@
/// <summary>
/// 鏌ヨ瀹炵洏搴撳瓨淇℃伅
/// </summary>
- private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, string productionLine)
+ private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> devices, string productionLine)
{
var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+ if (area == null)
+ {
+ ConsoleHelper.WriteErrorLine($"鏌ヨ瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{areaCode}鐨勬暟鎹�");
+ return null;
+ }
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
- .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+ var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ List<string>? materielCodes = outBoundMateriel.Count != 0
+ ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == area.AreaCode)
+ .Select(x => x.MaterielCode)
+ .ToList()
+ : null;
+
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+ var result = new DtStockInfo();
+
+ //if (stockInfoList.IsNullOrEmpty())
+ //{
+ // stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ // .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).IncludesAllFirstLayer().ToListAsync();
+ //}
+
+ result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)
+ .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
+ .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
+ .OrderBy(x => x.OutboundTime)
+ .FirstOrDefault();
+
+ return result;
+ }
+
+ /// <summary>
+ /// 鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅
+ /// </summary>
+ private async Task<DtStockInfo> QueryStockInfoForRealTrayCWAsync(List<string> areaCodes, string productionLine)
+ {
+ var areaId = (await _areaInfoRepository.QueryDataAsync(x => areaCodes.Contains(x.AreaCode))).Select(x => x.AreaID).ToList();
+ if (areaId.Count == 0)
+ {
+ ConsoleHelper.WriteErrorLine($"鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{JsonConvert.SerializeObject(areaCodes)}鐨勬暟鎹�");
+ return null;
+ }
+
+ //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ //List<string> materielCodes = null;
+ //if (outBoundMateriel.Count != 0)
+ //{
+ // materielCodes = outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0]).Select(x => x.MaterielCode).ToList();
+ //}
+
+ var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ List<string>? materielCodes = outBoundMateriel.Count != 0
+ ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0])
+ .Select(x => x.MaterielCode)
+ .ToList()
+ : null;
+
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => x.DeviceCode.Contains("CWSC"))
+ .ToList().Select(x => x.DeviceCode).ToList();
+ //var deviceCode = devices.Select(x => x.DeviceCode).ToList();
+
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+
+ var result = stockInfoList.Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
.WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && areaId.Contains(x.LocationInfo.AreaId) && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
.OrderBy(x => x.OutboundTime) // 鎺掑簭
- .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
+ .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
- //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return firstOrDefault;
return result;
}
/// <summary>
/// 鏌ヨ绌虹洏搴撳瓨淇℃伅
/// </summary>
- private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode)
+ private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, string position)
{
var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
+ ConsoleHelper.WriteColorLine(position + "..." + areaCode, ConsoleColor.Magenta);
+ var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == position && x.stationType == 17);
+
+ ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
+ var stackers = station.Roadway.Split(',').ToList();
+
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => stackers.Contains(x.DeviceCode))
+ .ToList().Select(x => x.DeviceCode).ToList();
+
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+
+ var result = stockInfoList.Where(x => x.ProductionLine == station.productLine)
.Where(x => x.AreaCode == areaCode && x.IsFull == false)
.Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
.OrderBy(x => x.CreateDate) // 鎺掑簭
- .FirstAsync(); // 杞崲涓哄垪琛�
+ .FirstOrDefault(); // 杞崲涓哄垪琛�
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return firstOrDefault;
+ //if (result != null)
+ //{
+ // stockInfoList = stockInfoList.Where(x => x != result).ToList();
+ // _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
+ //}
+
return result;
}
@@ -1080,7 +1302,7 @@
{
return new Dt_Task
{
- Grade = 1,
+ Grade = tag == 104 ? (stockInfo.LocationInfo.RoadwayNo.Contains("CWSC") ? 1 : 2) : (stockInfo.LocationInfo.RoadwayNo.Contains("CWSC") ? 2 : 1),
Roadway = stockInfo.LocationInfo.RoadwayNo,
TargetAddress = position,
Dispatchertime = DateTime.Now,
@@ -1096,6 +1318,8 @@
Creater = "System", // 淇鎷煎啓閿欒
CreateDate = DateTime.Now,
TaskId = 0,
+ ProductionLine = stockInfo.ProductionLine,
+ ProcessCode = stockInfo.ProcessCode,
};
}
@@ -1107,7 +1331,7 @@
return new WMSTaskDTO
{
TaskNum = task.TaskNum.Value,
- Grade = 1,
+ Grade = task.Grade.Value,
PalletCode = task.PalletCode,
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
@@ -1115,10 +1339,11 @@
TaskState = task.TaskState.Value,
Id = 0,
TaskType = task.TaskType,
+ ProductionLine = task.ProductionLine,
};
}
- #endregion 璇锋眰鍑哄簱
+ #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
#region 浠诲姟鐘舵�佹洿鏀�
@@ -1168,34 +1393,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,6 +1408,10 @@
{
return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
}
+ if (stockInfo.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇ヨ揣浣嶇姸鎬佷笉绛変簬銆愭湁璐с�戣鏌ョ湅鏄惁宸茬粡鏈変换鍔★紒");
+ }
var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
if (task != null)
@@ -1222,8 +1424,22 @@
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.Contains("JZSC"))
+ {
+ var targetAddress = "002-021-001";
+ if (stockInfo.LocationInfo.RoadwayNo == "JZSC4")
+ targetAddress = "001-021-001";
+ task = CreateTask(stockInfo, targetAddress, taskType);
+ }
+ }
//var taskId = await BaseDal.AddDataAsync(task);
//if (taskId <= 0)
//{
@@ -1261,6 +1477,7 @@
return content;
}
+
private string GetWCSIpReceiveTask()
{
var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
@@ -1273,7 +1490,317 @@
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",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
+ };
+
+ // 鍒涘缓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
+ {
+ var location = await GetLocationDistributeAsync(station.Roadway);
+ 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.InTray,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
+ };
+ // 鍒涘缓WMS浠诲姟
+ WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
+
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ // 娣诲姞浠诲姟鍒版暟鎹簱
+ await BaseDal.AddDataAsync(task);
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ location.LocationStatus = (int)LocationEnum.Lock;
+ await _locationRepository.UpdateDataAsync(location);
+ });
+
+ content.OK(data: taskDTO);
+ }
+ }
+ 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.SourceAddress,
+ TargetAddress = taskOld.TargetAddress,
+ TaskState = taskOld.TaskState.Value,
+ Id = 0,
+ TaskType = taskOld.TaskType,
+ ProductionLine = taskOld.ProductionLine
+ };
+ }
+ 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,
+ ProductionLine = task.ProductionLine
+ };
+ }
+ else
+ {
+ throw new ArgumentException("Invalid source object type for WMSTaskDTO creation.");
+ }
+ }
+
+ #endregion 闈欑疆寮傚父鍙ｅ叆搴�
#endregion 澶栭儴鎺ュ彛鏂规硶
@@ -1317,6 +1844,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>
@@ -1428,19 +1984,23 @@
/// </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();
+ task.TaskState = task.TaskType > 199 ? (int)TaskInStatusEnum.InFinish : (int)TaskOutStatusEnum.OutFinish;
task.CurrentAddress = task.NextAddress;
// 鍒涘缓鍘嗗彶浠诲姟
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();
+ if (isHand)
+ {
+ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
+ }
+ taskHty.TaskState = task.TaskType > 199 ? (int)TaskInStatusEnum.InFinish : (int)TaskOutStatusEnum.OutFinish;
return taskHty;
}
@@ -1450,20 +2010,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>
@@ -1495,19 +2054,33 @@
.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)
+ if (stock.IsFull)
{
- foreach (var item in stocks)
+ // 鏌ヨ绗﹀悎鏉′欢鐨勫簱瀛樹俊鎭�
+ var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
+
+ // 鏌ヨ浠诲姟淇℃伅
+ var tasks = BaseDal.QueryData(x => x.PalletCode != stock.PalletCode && x.ProductionLine == stock.ProductionLine).Select(x => x.PalletCode).ToList();
+
+ if (stocks != null && stocks.Count > 0)
{
- 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 stocksToUpdate = stocks.Where(item => !tasks.Contains(item.PalletCode)).ToList();
+ foreach (var item in stocksToUpdate)
+ {
+ // 鏇存柊搴撳瓨淇℃伅鐨勭壒瀹氬弬鏁�
+ item.SpecialParameterDuration = stock.SpecialParameterDuration;
+ item.ParameterInfos = stock.ParameterInfos;
+ item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
+ }
+ if (stocksToUpdate.Count > 0)
+ {
+ // 寮傛鏇存柊搴撳瓨淇℃伅
+ var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocksToUpdate);
+ }
}
- var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocks);
}
// 娣诲姞鍘嗗彶浠诲姟
@@ -1543,79 +2116,95 @@
#region 浠诲姟璇锋眰鏂规硶
+ private static readonly SemaphoreSlim _semaphoreUpdate = new SemaphoreSlim(1, 1);
// 鏇存柊浠诲姟璐т綅
private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
{
- if (task == null)
- {
- return new WebResponseContent().Error("浠诲姟瀵硅薄涓虹┖");
- }
-
+ await _semaphoreUpdate.WaitAsync();
try
{
- // 鍒涘缓WebResponseContent瀵硅薄
- var content = new WebResponseContent();
+ if (task == null)
+ {
+ return new WebResponseContent().Error("浠诲姟瀵硅薄涓虹┖");
+ }
- // 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
- if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ try
{
- // 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 = _stockInfoRepository.QueryFirst(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);
- }
- else
- {
- var location = await GetLocationDistributeAsync(task.Roadway);
- if (location == null)
+ // 鍒涘缓WebResponseContent瀵硅薄
+ var content = new WebResponseContent();
+
+ // 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
+
+ input.Position = Regex.Replace(input.Position, @"-(\d+)", "");
+ if (Convert.ToInt32(input.Position) > 1999)
{
- return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+ input.Position = (Convert.ToInt32(input.Position) - 1000).ToString();
}
- 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)
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
{
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏇存柊浠诲姟澶辫触");
+ // 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);
+ }
+ else
+ {
+ var location = await GetLocationDistributeAsync(task.Roadway);
+ if (location == null)
+ {
+ return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+ }
- // 鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- return content.OK(data: task);
+ 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}");
+ }
}
- catch (Exception ex)
+ catch (Exception)
{
- // 鍥炴粴浜嬪姟
- _unitOfWorkManage.RollbackTran();
- // 杩欓噷鍙互娣诲姞鏃ュ織璁板綍
- return new WebResponseContent().Error($"鏇存柊浠诲姟鏃跺彂鐢熼敊璇�: {ex.Message}");
+ throw;
}
+ finally { _semaphoreUpdate.Release(); }
}
private void MapTaskProperties(Dt_Task task, RequestTaskDto input, string toAddress, int taskState)
@@ -1655,7 +2244,7 @@
/// <param name="process">宸烽亾</param>
/// <param name="flag">鏍囪瘑锛�0-鍏ュ簱锛�1-绌烘墭鐩樺叆搴擄紝2-NG鍏ュ簱锛�3-鍑哄簱锛�</param>
/// <returns></returns>
- private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, List<string> process = null, int flag = 0)
+ private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, string processCode, List<string> process = null, int flag = 0)
{
WebResponseContent content = new WebResponseContent();
@@ -1683,7 +2272,9 @@
TaskState = flag == 3 ? (int)TaskOutStatusEnum.OutNew : (int)TaskInStatusEnum.InNew,
TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "Systeam",
+ ProductionLine = productionLine,
+ ProcessCode = processCode
};
// 灏濊瘯娣诲姞鏂颁换鍔�
@@ -1712,6 +2303,7 @@
TaskState = task.TaskState.Value,
Id = 0,
TaskType = task.TaskType,
+ ProductionLine = task.ProductionLine
};
content.OK(data: taskDTO);
}
@@ -1723,6 +2315,8 @@
return content;
}
+ private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+
/// <summary>
/// 鏌ユ壘璐т綅
/// </summary>
@@ -1733,16 +2327,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)
@@ -1757,6 +2352,10 @@
Console.WriteLine(err.Message.ToString());
return null;
}
+ finally
+ {
+ _semaphore.Release();
+ }
#endregion 鑾峰彇璐т綅
}
@@ -1767,7 +2366,11 @@
/// <returns></returns>
public async Task<string> GetRoadWayAsync(List<string> process)
{
- var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
+ var deviceCode = await SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == 1.ToString() && process.Contains(x.DeviceCode))
+ .Select(x => x.DeviceCode).ToListAsync();
+
+ var minGroup = _locationRepository.QueryData(x => deviceCode.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
.GroupBy(x => x.RoadwayNo)
.OrderByDescending(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
.ToList(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
@@ -1807,6 +2410,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,
+ LowerLimit = 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