From 223a7b9cdb5db711ac644bcfdbbbc7c4d2b7f344 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期四, 26 十二月 2024 13:58:24 +0800
Subject: [PATCH] 优化代码结构和增强功能
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 438 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 395 insertions(+), 43 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 b19f3b0..e6c0992 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,6 +1,8 @@
-锘縰sing Mapster;
+锘縰sing AngleSharp.Dom;
+using Mapster;
using Masuit.Tools;
using SixLabors.Fonts.Tables.AdvancedTypographic;
+using System.Diagnostics;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Core.Const;
@@ -8,6 +10,7 @@
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;
namespace WIDESEA_StorageTaskServices;
@@ -77,18 +80,100 @@
{
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);
+
+ var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+ task.Remark = result.Success ? null : "NG";
+
+ if (!result.Success && result.MessageCode == "E10001")
+ {
+ await HandleOutBoundError(stock, task);
+ }
}
}
}
@@ -96,6 +181,8 @@
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
var taskHty = task.Adapt<Dt_Task_Hty>();
+ DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfo_Hty.ModifyDate = DateTime.Now;
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -104,9 +191,9 @@
{
await DeleteStockInfoAsync(stock.Id);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await AddStockInfoHtyAsync(stockInfo_Hty);
}
await UpdateLocationAsync(loc);
- //if (task.Roadway.Contains("FR") || task.Roadway.Contains("GW") || task.TaskType == (int)TaskOutboundTypeEnum.OutTray) //濡傛灉鏄垎瀹规垨楂樻俯鍑哄簱 灏嗕换鍔″垹闄�
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
@@ -175,10 +262,6 @@
};
}
- 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);
@@ -199,6 +282,15 @@
if (!isStockUpdated)
{
throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task AddStockInfoHtyAsync(DtStockInfo_Hty dtStock)
+ {
+ var isStockAdd = await SqlSugarHelper.Db.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
+ if (!isStockAdd)
+ {
+ throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
}
}
@@ -917,7 +1009,7 @@
}
catch (Exception err)
{
- throw;
+ return content.Error(err.Message);
}
}
@@ -1331,6 +1423,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
{
@@ -1339,20 +1554,10 @@
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,
- };
+ if (taskOld != null)
+ {
+ // 鍒涘缓WMS浠诲姟
+ WMSTaskDTO taskDTO = CreateWMSTaskDTO(taskOld);
return content.OK(data: taskDTO);
}
var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
@@ -1363,11 +1568,37 @@
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
{
@@ -1388,26 +1619,16 @@
};
// 鍒涘缓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,
- };
+ WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
await _unitOfWorkManage.UseTranAsync(async () =>
{
// 娣诲姞浠诲姟鍒版暟鎹簱
await BaseDal.AddDataAsync(task);
// 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
- location.LocationStatus = (int)LocationEnum.InStockDisable;
+ location.LocationStatus = (int)LocationEnum.Lock;
await _locationRepository.UpdateDataAsync(location);
+ await _boxingInfoRepository.AddDataNavAsync(boxing);
});
content.OK(data: taskDTO);
@@ -1423,9 +1644,50 @@
}
catch (Exception ex)
{
+ // 鏇磋缁嗙殑鏃ュ織璁板綍锛屽彲浣跨敤鏃ュ織妗嗘灦鏇挎崲 Console.WriteLine
+ Console.WriteLine($"Error in CreateAndSendInboundTask: {ex.Message}");
content.Error(ex.Message);
}
return content;
+ }
+
+
+ private WMSTaskDTO CreateWMSTaskDTO(object source)
+ {
+ if (source is Dt_Task taskOld)
+ {
+ return new WMSTaskDTO()
+ {
+ TaskNum = taskOld.TaskNum.Value,
+ Grade = 1,
+ PalletCode = taskOld.PalletCode,
+ RoadWay = taskOld.Roadway,
+ SourceAddress = taskOld.CurrentAddress,
+ TargetAddress = taskOld.TargetAddress,
+ TaskState = taskOld.TaskState.Value,
+ Id = 0,
+ TaskType = taskOld.TaskType,
+ };
+ }
+ else if (source is Dt_Task task)
+ {
+ return new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.TargetAddress,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = task.TaskType,
+ };
+ }
+ else
+ {
+ throw new ArgumentException("Invalid source object type for WMSTaskDTO creation.");
+ }
}
#endregion 闈欑疆寮傚父鍙ｅ叆搴�
@@ -1473,6 +1735,7 @@
{
return await BaseDal.Delete(ids);
}
+
public override WebResponseContent DeleteData(object[] key)
{
WebResponseContent content = new WebResponseContent();
@@ -1500,8 +1763,8 @@
{
return content.Error("鍒犻櫎浠诲姟寮傚父锛�" + ex.Message);
}
-
}
+
/// <summary>
/// 閫氳繃ID鑾峰彇浠诲姟
/// </summary>
@@ -1740,7 +2003,6 @@
// 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
-
input.Position = Regex.Replace(input.Position, @"-(\d+)", "");
if (Convert.ToInt32(input.Position) > 1999)
{
@@ -1911,6 +2173,8 @@
return content;
}
+
+ private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
/// <summary>
/// 鏌ユ壘璐т綅
/// </summary>
@@ -1921,6 +2185,7 @@
{
#region 鑾峰彇璐т綅
+ await _semaphore.WaitAsync();
try
{
List<DtLocationInfo> locations;
@@ -1944,6 +2209,10 @@
{
Console.WriteLine(err.Message.ToString());
return null;
+ }
+ finally
+ {
+ _semaphore.Release();
}
#endregion 鑾峰彇璐т綅
@@ -1995,6 +2264,89 @@
return minRoadwayNo;
}
+ // 鏂扮殑鍑哄簱閿欒澶勭悊閫昏緫
+ private async Task HandleOutBoundError(DtStockInfo stock, Dt_Task task)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
+ if (area == null)
+ {
+ throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
+ }
+
+ var trayCells = new TrayCellsStatusDto
+ {
+ Software = area.Spare3,
+ TrayBarcode = task.PalletCode,
+ EquipmentCode = area.Spare2,
+ SceneType = area.Spare4
+ };
+
+ content = await _cellStateService.GetTrayCellStatusAsync(trayCells);
+ if (!content.Status) return;
+
+ var ResultTray = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (ResultTray.SerialNos.Count > 0)
+ {
+ var parameterInfo = GetParameterInfo(stock);
+
+ var outHours = CalculateOutHours(stock);
+ var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble()
+ && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
+
+ var defectCode = !isNG ? "TQCK" : string.Empty;
+
+ var outputDto = CreateAgingOutputDto(area, stock, ResultTray, parameterInfo, outHours, defectCode);
+ content = await _agingInOrOutInputService.GetOCVOutputAsync(outputDto);
+
+ var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+ if (!result.Success)
+ task.Remark = "NG";
+ }
+ }
+
+ // 璁＄畻鍑哄簱灏忔椂鐨勬柟娉�
+ private double CalculateOutHours(DtStockInfo stock) =>
+ (DateTime.Now - Convert.ToDateTime(stock.LinedProcessFeedbackTime ?? stock.CreateDate.ToString())).TotalHours;
+
+ // 鐢熸垚 AgingOutputDto 鐨勫皝瑁呮柟娉�
+ private AgingOutputDto CreateAgingOutputDto(Dt_AreaInfo area, DtStockInfo stock, ResultTrayCellsStatus resultTray,
+ ParameterInfo parameterInfo, double outHours, string defectCode)
+ {
+ return new AgingOutputDto
+ {
+ OpFlag = 1,
+ Software = area.Spare3,
+ EquipmentCode = area.Spare2,
+ TrayBarcode = stock.PalletCode,
+ SerialNos = resultTray.SerialNos.Select(x => new SerialNoOutDto
+ {
+ SlotNo = x.PositionNo,
+ SerialNo = x.SerialNo,
+ SerialNoResult = true,
+ ParameterInfo = new List<ParameterInfoOutput>
+ {
+ new ParameterInfoOutput
+ {
+ Value = outHours.ToString(),
+ ParameterCode = parameterInfo.ParameterCode,
+ ParameterDesc = parameterInfo.Description,
+ ParameterResult = "OK",
+ TargetValue = parameterInfo.TargetValue,
+ LowerLomit = parameterInfo.LowerSpecificationsLimit,
+ UpperLimit = parameterInfo.UpperSpecificationsLimit,
+ DefectCode = defectCode,
+ }
+ }
+ }).ToList()
+ };
+ }
+
+ // 鑾峰彇鍙傛暟淇℃伅鐨勮緟鍔╂柟娉�
+ private ParameterInfo GetParameterInfo(DtStockInfo stock) =>
+ JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos)
+ .FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
+
#endregion 浠诲姟璇锋眰鏂规硶
#endregion private 鍐呴儴鏂规硶
--
Gitblit v1.9.3