From 663d9d2e658ab99a0c3598becd23b00b34b3e3d9 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期五, 29 十一月 2024 13:55:22 +0800
Subject: [PATCH] 高常温逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 209 +++++++++++++++++++++++++++++-----------------------
1 files changed, 117 insertions(+), 92 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 fd86725..311ccd4 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,17 +1,11 @@
-锘縰sing log4net.Core;
+锘�
using Mapster;
using Masuit.Tools;
-using Masuit.Tools.Models;
-using System.Linq;
-using System.Threading.Tasks;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
-using WIDESEA_IStorageBasicRepository;
+using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
-using WIDESEA_Model.Models;
using WIDESEA_StorageBasicRepository;
-using WIDESEA_StorageTaskRepository;
-using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;
namespace WIDESEA_StorageOutTaskServices;
@@ -20,17 +14,11 @@
{
private readonly LogFactory LogFactory = new LogFactory();
private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderRepository _outOrderRepository;
private readonly IStockInfoRepository _stockInfoRepository;
private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
private readonly IDt_Task_HtyRepository _task_HtyRepository;
- private readonly IDt_OutOrderAndStockRepository _outOrderAndStockRepository;
- private readonly IDt_OutOrderAndStock_HtyRepository _outOrderAndStock_HtyRepository;
private readonly IMapper _mapper;
- private readonly IDt_MaterielInfoRepository _materielInfoRepository;
private readonly ILocationInfoRepository _locationRepository;
- private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
- private readonly IPointStackerRelationRepository _pointStackerRelationRepository;
private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
private readonly IBoxingInfoRepository _boxingInfoRepository; //缁勭洏
@@ -38,21 +26,16 @@
private readonly IProcessApplyService _processApplyService; //宸ヨ壓璺嚎
private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
private readonly IAgingInOrOutInputService _agingInOrOutInputService; //闈欑疆\闄堝寲
- private readonly IProductionRepository _productionRepository; //鐢熶骇
private readonly IDt_StationManagerRepository _stationManagerRepository;
+ private readonly ISys_ConfigService _configService;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
IDt_OutOrderRepository outOrderRepository,
IStockInfoRepository stockInfoRepository,
- IDt_OutOrderAndStockRepository dt_OutOrderAndStockRepository,
- IDt_OutOrderAndStock_HtyRepository dt_OutOrderAndStock_HtyRepository,
IDt_Task_HtyRepository task_HtyRepository,
IMapper mapper,
- IDt_MaterielInfoRepository materielInfoRepository,
ILocationInfoRepository locationRepository,
- IDt_WareAreaInfoRepository wareAreaInfoRepository,
- IPointStackerRelationRepository pointStackerRelationRepository,
ITaskExecuteDetailRepository taskExecuteDetailRepository,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
IBoxingInfoRepository boxingInfoRepository,
@@ -61,20 +44,14 @@
IDt_AreaInfoRepository areaInfoRepository,
IAgingInOrOutInputService agingInOrOutInputService,
IStockInfoDetailRepository stockInfoDetailRepository,
- IProductionRepository productionRepository,
- IDt_StationManagerRepository stationManagerRepository) : base(BaseDal)
+ IDt_StationManagerRepository stationManagerRepository,
+ ISys_ConfigService configService) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
- _outOrderRepository = outOrderRepository;
_stockInfoRepository = stockInfoRepository;
- _outOrderAndStockRepository = dt_OutOrderAndStockRepository;
- _outOrderAndStock_HtyRepository = dt_OutOrderAndStock_HtyRepository;
_task_HtyRepository = task_HtyRepository;
_mapper = mapper;
- _materielInfoRepository = materielInfoRepository;
_locationRepository = locationRepository;
- _wareAreaInfoRepository = wareAreaInfoRepository;
- _pointStackerRelationRepository = pointStackerRelationRepository;
_taskExecuteDetailRepository = taskExecuteDetailRepository;
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_boxingInfoRepository = boxingInfoRepository;
@@ -83,8 +60,8 @@
_areaInfoRepository = areaInfoRepository;
_agingInOrOutInputService = agingInOrOutInputService;
_stockInfoDetailRepository = stockInfoDetailRepository;
- _productionRepository = productionRepository;
_stationManagerRepository = stationManagerRepository;
+ _configService = configService;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -106,7 +83,12 @@
{
var agingOutputDto = MapToAgingOutputDto(stock);
content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
- ValidateResponse(content);
+ //ValidateResponse(content);
+ var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+ if (!result.Success)
+ {
+ task.Remark = "NG";
+ }
}
}
@@ -119,10 +101,11 @@
await UpdateLocationAsync(loc);
await DeleteStockInfoAsync(stock.Id);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
- //await DeleteTaskAsync(task.TaskId);
+ if (task.Roadway.Contains("FR") || task.Roadway.Contains("GW")) //濡傛灉鏄垎瀹规垨楂樻俯鍑哄簱 灏嗕换鍔″垹闄�
+ await DeleteTaskAsync(task.TaskId);
});
- return content.OK("浠诲姟瀹屾垚鎴愬姛");
+ return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
}
catch (Exception err)
{
@@ -143,9 +126,21 @@
var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos).FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
if (parameterInfo == null) throw new Exception("");
- var outHours = (DateTime.Now - stock.OutboundTime.Value).TotalHours;
+ var outHours = (DateTime.Now - (stock.LinedProcessFeedbackTime == null ? stock.CreateDate : stock.LinedProcessFeedbackTime.ToDateTime())).TotalHours;
+
+ //if (stock.LinedProcessFeedbackTime == null)
+ //{
+ // outHours = (DateTime.Now - stock.CreateDate).TotalHours;
+ //}
+ //else
+ //{
+ // outHours = (DateTime.Now - stock.LinedProcessFeedbackTime.ToDateTime()).TotalHours;
+ //}
+
var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
+ var defectCode = string.Empty;
+ if (!isNG) defectCode = "TQCK";
return new AgingOutputDto
{
OpFlag = 1,
@@ -166,6 +161,7 @@
TargetValue = parameterInfo.TargetValue,
LowerLomit = parameterInfo.LowerSpecificationsLimit,
UpperLimit = parameterInfo.UpperSpecificationsLimit,
+ DefectCode = defectCode
}
}
}).ToList()
@@ -174,16 +170,12 @@
private void ValidateResponse(WebResponseContent content)
{
- var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
- if (!result.Success)
- {
- throw new Exception(result.MOMMessage);
- }
+
}
private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(DtStockInfo stock, Dt_Task task)
{
- var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
//var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
location.LocationStatus = (int)LocationEnum.Free;
@@ -303,7 +295,7 @@
// 鑾峰彇瑁呯淇℃伅鍜岀洰鏍囦綅缃俊鎭�
var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
- var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
+ var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);
// 鏇存柊鐩爣浣嶇疆鐘舵�佷负搴撳瓨涓�
locationInf.LocationStatus = (int)LocationEnum.InStock;
@@ -314,8 +306,9 @@
// 鏍规嵁鏄惁鏈夌粍鐩樹俊鎭垱寤哄簱瀛樺疄渚嬫ā鍨�
DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);
+
// 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
+ bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);
if (isResult)
{
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
@@ -349,13 +342,41 @@
CreateDate = DateTime.Now,
Creater = "system",
IsFull = false,
- AreaCode = area.AreaCode,
+ AreaCode = area.AreaCode ?? "",
LocationId = loation.Id,
StockInfoDetails = new List<DtStockInfoDetail>()
{
new DtStockInfoDetail()
{
MaterielCode = "绌烘墭鐩�",
+ Id = 0,
+ Status = (int)StockStateEmun.宸插叆搴�
+ }
+ }
+ };
+ }
+
+ /// <summary>
+ /// 鍒涘缓鍒嗗鐨勫疄鎵樼洏鐨勫簱瀛樺疄渚嬫ā鍨�
+ /// </summary>
+ private DtStockInfo CreateFullPalletStockByFR(Dt_Task task, DtLocationInfo locationInf)
+ {
+ var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+ return new DtStockInfo()
+ {
+ PalletCode = task.PalletCode,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFull = false,
+ AreaCode = area.AreaCode ?? "",
+ LocationId = loation.Id,
+ StockInfoDetails = new List<DtStockInfoDetail>()
+ {
+ new DtStockInfoDetail()
+ {
+ MaterielCode = "瀹炴墭鐩�",
Id = 0,
Status = (int)StockStateEmun.宸插叆搴�
}
@@ -404,7 +425,7 @@
stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
stock.SpecialParameterDuration = respone.SpecialParameterDuration;
//2024骞�11鏈�16鏃ワ細鏂板瀛楁璁＄畻搴斿嚭搴撴椂闂�
- stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
+ 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;
@@ -440,9 +461,9 @@
}
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉浠诲姟鏄惁瀛樺湪", JsonConvert.SerializeObject(task));
- if(task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
+ if (task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
{
- return await CompleteInToOutTaskAsync(task);
+ return await CompleteInToOutTaskAsync(task);
}
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
@@ -541,7 +562,17 @@
if (serialNosError.Count > 0)
{
// TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
- List<string> NGStation = input.Position == "1088" ? new List<string>() { "1020" } : new List<string>() { "JZSC01" };
+ var efg = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea == area.AreaCode).ToList();
+ //List<string> NGStation = input.Position == "1088" ? new List<string>() { "1020" } : new List<string>() { "JZSC01" };
+ if (efg.Count <= 0)
+ {
+ throw new Exception("鏈壘鍒癗G鍏ュ簱绔欏彴閰嶇疆");
+ }
+ List<string> NGStation = efg.Select(x => x.stationNGLocation).ToList();
+ if (NGStation.Count <= 0)
+ {
+ NGStation = efg.Select(x => x.stationNGChildCode).ToList();
+ }
content = await CreateNewTask(input, NGStation, 2);
return content.Error("瀛樺湪寮傚父鐢佃姱");
}
@@ -552,6 +583,7 @@
content = await RequestTrayInTaskAsync(input);
return content;
}
+ //Console.WriteLine("qqqqq");
// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
//var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
@@ -560,7 +592,8 @@
// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
- var boxing = await CreateBoxingInfo(result, input.PalletCode);
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ //Console.WriteLine(boxing.ToJsonString());
if (boxing == null) return content.Error("缁勭洏澶辫触");
// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
@@ -580,12 +613,25 @@
// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+ var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
+ if ((resultProcessApply.Success)) return content.Error("宸ヨ壓鐢宠澶辫触");
- //// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
+ var par = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode == boxing.ProcessCode).FirstOrDefault().Number.ToInt32();
+
+
+ // 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
//var processResponse = await GetProcessResponseAsync(process, input.Position);
- List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
- // 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
+ ////List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
+ Console.WriteLine(area.AreaCode+"-----------------------");
+ Console.WriteLine(input.Position + "-----------------------");
+ var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea == area.AreaCode).ToList();
+ if (stationManagers.Count <= 0)
+ {
+ throw new Exception("鏈壘鍒癗G鍏ュ簱绔欏彴閰嶇疆");
+ }
+ List<string> strings = stationManagers.Select(x => x.Roadway).ToList();
+ //// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
content = await CreateNewTask(input, strings);
if (content.Status)
{
@@ -658,8 +704,15 @@
return content.OK(data: task);
}
+ var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position).ToList();
+ if (stationManagers.Count <= 0)
+ {
+ throw new Exception("鏈壘鍒扮┖鎵樼洏鍏ュ簱绔欏彴閰嶇疆");
+ }
+
+
// 鑾峰彇鐩爣鍦板潃
- List<string> strings = input.Position == "1016" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
+ List<string> strings = stationManagers.Select(x => x.Roadway).ToList();
return await CreateNewTask(input, strings, 1);
}
@@ -678,12 +731,13 @@
}
// 鑾峰彇缁勭洏淇℃伅
- private async Task<DtBoxingInfo> CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
+ private DtBoxingInfo CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
{
return new DtBoxingInfo
{
PalletCode = palletCode,
IsFull = true,
+ ProcessCode = result.ProcessCode,
BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
{
SerialNumber = serialNoObj.SerialNo,
@@ -741,7 +795,7 @@
if (hasTask != null)
{
WMSTaskDTO taskDTO1 = CreateTaskDTO(hasTask);
- return content.OK("宸插瓨鍦ㄧ┖鐩樺嚭搴撲换鍔�", data: taskDTO1);
+ return content.OK("宸插瓨鍦ㄥ嚭搴撲换鍔�", data: taskDTO1);
}
// 鍒涘缓鏂颁换鍔″疄渚�
@@ -835,7 +889,9 @@
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = tag == (int)TaskOutboundTypeEnum.Outbound ? (int)TaskOutboundTypeEnum.Outbound : (int)TaskOutboundTypeEnum.OutTray,
TaskNum = BaseDal.GetTaskNo().Result,
- Creater = "System" // 淇鎷煎啓閿欒
+ Creater = "System", // 淇鎷煎啓閿欒
+ CreateDate = DateTime.Now,
+ TaskId = 0,
};
}
@@ -1086,39 +1142,6 @@
#region private 鍐呴儴鏂规硶
/// <summary>
- /// 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樹俊鎭�
- /// </summary>
- /// <param name="stock">搴撳瓨瀹炰緥</param>
- /// <param name="barCode">鏉＄爜</param>
- /// <returns>鏇存柊鍚庣殑璁㈠崟鍜屽簱瀛樹俊鎭�</returns>
- private async Task<Dt_OutOrderAndStock> UpdateOrderAndStockAsync(DtStockInfo stock, string barCode)
- {
- //鏍规嵁PalletCode鑾峰彇璁㈠崟鍜屽簱瀛樹俊鎭�
- var orderStock = await _outOrderAndStockRepository.GetOrderAndStock(palletCode: barCode);
-
- //瀹屾垚鏁伴噺澧炲姞
- orderStock.CompletedQuantity += stock.StockInfoDetails.Sum(x => x.StockQuantity);
-
- //璁㈠崟璇︽儏瀹屾垚鏁伴噺澧炲姞
- orderStock.OrderList.OrderDetailList.CompletedQuantity += stock.StockInfoDetails.Sum(x => x.StockQuantity);
-
- //杩斿洖鏇存柊鍚庣殑璁㈠崟鍜屽簱瀛樹俊鎭�
- return orderStock;
- }
-
- /// <summary>
- /// 鍒ゆ柇璁㈠崟鏄惁瀹屾垚
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <returns>鏄惁瀹屾垚</returns>
- // 鍒ゆ柇璁㈠崟鏄惁瀹屾垚
- private bool IsOrderComplete(Dt_OutOrderAndStock orderStock)
- {
- // 濡傛灉鍑哄簱鏁伴噺绛変簬瀹屾垚鍑哄簱鏁伴噺锛屽垯璁㈠崟瀹屾垚
- return orderStock.CompletedQuantity == orderStock.OutboundQuantity;
- }
-
- /// <summary>
/// 鍒涘缓鍘嗗彶浠诲姟璁板綍
/// </summary>
/// <param name="task"></param>
@@ -1184,12 +1207,14 @@
{
// 娣诲姞搴撳瓨
isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
- isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
- .Include(x => x.BoxingInfoDetails)
- .ExecuteCommandAsync();
+ if (boxingInfo != null)
+ {
+ isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
+ .Include(x => x.BoxingInfoDetails)
+ .ExecuteCommandAsync();
+ }
+
}
-
-
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
--
Gitblit v1.9.3