From bcde5ea70330cb16597c2320b94b5f1d7cb15752 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 15 二月 2025 15:32:16 +0800
Subject: [PATCH] 优化页面
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 940 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 766 insertions(+), 174 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 04de7fa..5e9b978 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,4 +1,5 @@
-锘縰sing Mapster;
+锘縰sing Autofac.Core;
+using Mapster;
using Masuit.Tools;
using System.Text.RegularExpressions;
using WIDESEA_Core.Const;
@@ -7,6 +8,8 @@
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;
+using WIDESEAWCS_QuartzJob.Models;
+
namespace WIDESEA_StorageTaskServices;
@@ -75,25 +78,125 @@
{
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") && stock.ProcessCode != "OCVB") //闈炲垎瀹瑰簱鍖轰笌褰撳墠宸ュ簭鏄疧CVB鍧囦笂鎶OM鍑哄叆绔�
+ //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());
+
+ 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;
+
+ DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfo_Hty.ModifyDate = DateTime.Now;
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -102,9 +205,9 @@
{
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);
});
@@ -163,7 +266,7 @@
ParameterDesc = parameterInfo.Description,
ParameterResult = "OK", //isNG.ToString(),
TargetValue = parameterInfo.TargetValue,
- LowerLomit = parameterInfo.LowerSpecificationsLimit,
+ LowerLimit = parameterInfo.LowerSpecificationsLimit,
UpperLimit = parameterInfo.UpperSpecificationsLimit,
DefectCode = defectCode,
UOMCode = parameterInfo.UOMCode,
@@ -173,19 +276,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);
@@ -197,6 +298,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("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
}
}
@@ -285,7 +395,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;
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
@@ -309,6 +419,7 @@
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;
@@ -320,6 +431,10 @@
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("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
}
// 鏍规嵁鏄惁鏈夌粍鐩樹俊鎭垱寤哄簱瀛樺疄渚嬫ā鍨�
@@ -329,6 +444,7 @@
bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);
if (isResult)
{
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
}
else
@@ -362,6 +478,7 @@
IsFull = false,
AreaCode = area.AreaCode ?? "",
LocationId = loation.Id,
+ ProductionLine = task.ProductionLine,
StockInfoDetails = new List<DtStockInfoDetail>()
{
new DtStockInfoDetail()
@@ -430,6 +547,8 @@
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("鏈壘鍒板搴斿尯鍩熶俊鎭�");
@@ -452,7 +571,7 @@
Remark = boxing.BoxingInfoDetails.Count().ToString(),
};
- if (boxing.ProcessCode != "OCVB")
+ if (boxing.ProcessCode != "OCVB" && !task.Roadway.Contains("FR"))
{
// 澶勭悊璇锋眰鍙傛暟
AgingInputDto agingInputDto = new AgingInputDto()
@@ -537,6 +656,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);
@@ -626,7 +746,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鎺掑嚭鍙�
@@ -641,7 +761,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("瀛樺湪寮傚父鐢佃姱");
}
@@ -678,7 +798,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
@@ -686,7 +806,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);
}
@@ -775,7 +895,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);
@@ -831,6 +951,8 @@
Creater = "System", // 淇鎷煎啓閿欒
CreateDate = DateTime.Now,
TaskId = 0,
+ ProductionLine = stock.ProductionLine,
+ ProcessCode = stock.ProcessCode,
};
var taskDTO = CreateTaskDTO(taskNew);
@@ -850,11 +972,17 @@
// 鍒涘缓骞惰幏鍙栨暣鐩樼數鑺姸鎬�
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)
{
// 绌烘墭鐩樺叆搴撻�昏緫
@@ -872,17 +1000,34 @@
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);
+ return await ProcessBasedOnProcessCode(boxing, area, input, result);
+ }
}
catch (Exception err)
{
@@ -912,7 +1057,7 @@
}
catch (Exception err)
{
- throw;
+ return content.Error(err.Message);
}
}
@@ -931,20 +1076,46 @@
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)
@@ -954,9 +1125,8 @@
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)
{
@@ -1024,13 +1194,16 @@
{
// 鏍规嵁鎵樼洏绫诲瀷鏌ヨ搴撳瓨淇℃伅
DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
- ? areaCodes == null ? await QueryStockInfoForRealTrayAsync(areaCode, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine)
- : await QueryStockInfoForEmptyTrayAsync(areaCode);
+ ? 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);
@@ -1065,6 +1238,7 @@
{
// 璁板綍寮傚父淇℃伅骞舵姏鍑�
LogFactory.GetLog("璇锋眰鎵樼洏浠诲姟").Error(true, ex);
+ ConsoleHelper.WriteErrorLine("璇锋眰绌�/瀹炴墭鐩樹换鍔�" + ex.Message);
return content.Error(ex.Message);
}
}
@@ -1072,7 +1246,7 @@
/// <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);
@@ -1081,7 +1255,8 @@
.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) // 杩囨护鏉′欢
+ .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(); // 鑾峰彇绗竴涓厓绱�
@@ -1092,18 +1267,30 @@
}
/// <summary>
- /// 鏌ヨ瀹炵洏搴撳瓨淇℃伅
+ /// 鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForRealTrayCWAsync(List<string> areaCodes, string productionLine)
{
- var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "CWSC1");
+ 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 devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => x.DeviceRemark == "1")
+ .ToList();
+ var deviceCode = devices.Select(x => x.DeviceCode).ToList();
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) // 杩囨护鏉′欢
+ .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))
.OrderBy(x => x.OutboundTime) // 鎺掑簭
.FirstAsync(); // 鑾峰彇绗竴涓厓绱�
@@ -1116,16 +1303,32 @@
/// <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);
+
+ 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 devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => stackers.Contains(x.DeviceCode))
+ .ToList();
+
+ var deviceCode = devices.Select(x => x.DeviceCode).ToList();
var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
.Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
.Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
+ .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(); // 杞崲涓哄垪琛�
@@ -1141,7 +1344,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,
@@ -1157,6 +1360,8 @@
Creater = "System", // 淇鎷煎啓閿欒
CreateDate = DateTime.Now,
TaskId = 0,
+ ProductionLine = stockInfo.ProductionLine,
+ ProcessCode = stockInfo.ProcessCode,
};
}
@@ -1168,7 +1373,7 @@
return new WMSTaskDTO
{
TaskNum = task.TaskNum.Value,
- Grade = 1,
+ Grade = task.Grade.Value,
PalletCode = task.PalletCode,
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
@@ -1176,6 +1381,7 @@
TaskState = task.TaskState.Value,
Id = 0,
TaskType = task.TaskType,
+ ProductionLine = task.ProductionLine,
};
}
@@ -1244,6 +1450,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)
@@ -1264,9 +1474,12 @@
}
else
{
- if (stockInfo.LocationInfo.RoadwayNo == "JZSC1")
+ if (stockInfo.LocationInfo.RoadwayNo.Contains("JZSC"))
{
- task = CreateTask(stockInfo, "002-021-001", taskType);
+ 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);
@@ -1325,6 +1538,129 @@
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
{
@@ -1332,64 +1668,123 @@
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.Success)
+ if (result == null || !result.Success) return content.Error(result?.MOMMessage ?? "Deserialization error");
+
+ if (result.SerialNos.Count > 0)
{
- 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)
{
- var location = await GetLocationDistributeAsync(station.Roadway);
- // 鍒涘缓鏂颁换鍔″疄渚�
- var task = new Dt_Task
+ if (item.Number.ToInt32() == number + 1)
{
- 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.Roadway,
- 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);
+ boxing.NextProcessCode = item.ProcessCode;
+ }
}
- else
- content.Error(result.MOMMessage);
+ 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
@@ -1400,14 +1795,59 @@
}
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 澶栭儴鎺ュ彛鏂规硶
+
+
#region 鍐呴儴璋冪敤鏂规硶
@@ -1449,6 +1889,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>
@@ -1560,7 +2029,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();
@@ -1570,8 +2039,12 @@
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;
+ if (isHand)
+ {
+ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
+ }
taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
return taskHty;
}
@@ -1628,16 +2101,19 @@
}
}
- 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);
+ 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));
+ 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);
}
- var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocks);
}
// 娣诲姞鍘嗗彶浠诲姟
@@ -1673,78 +2149,97 @@
#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)
@@ -1784,7 +2279,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();
@@ -1812,7 +2307,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
};
// 灏濊瘯娣诲姞鏂颁换鍔�
@@ -1841,6 +2338,7 @@
TaskState = task.TaskState.Value,
Id = 0,
TaskType = task.TaskType,
+ ProductionLine = task.ProductionLine
};
content.OK(data: taskDTO);
}
@@ -1852,6 +2350,8 @@
return content;
}
+
+ private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
/// <summary>
/// 鏌ユ壘璐т綅
/// </summary>
@@ -1862,16 +2362,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)
@@ -1886,6 +2387,10 @@
Console.WriteLine(err.Message.ToString());
return null;
}
+ finally
+ {
+ _semaphore.Release();
+ }
#endregion 鑾峰彇璐т綅
}
@@ -1896,7 +2401,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(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
@@ -1936,6 +2445,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