From 222d2040c2a5e958b5fbd0b7047a8e802ec14288 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 23 十一月 2024 14:42:34 +0800
Subject: [PATCH] 一大堆
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 125 ++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 47 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 0344c68..3d73f68 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
@@ -10,10 +10,11 @@
using WIDESEA_StorageBasicRepository;
using WIDESEA_StorageTaskRepository;
using WIDESEA_StoragIntegrationServices;
+using WIDESEAWCS_BasicInfoRepository;
namespace WIDESEA_StorageOutTaskServices;
-public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
+public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
private readonly LogFactory LogFactory = new LogFactory();
private readonly IUnitOfWorkManage _unitOfWorkManage;
@@ -36,6 +37,7 @@
private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
private readonly IAgingInOrOutInputService _agingInOrOutInputService; //闈欑疆\闄堝寲
private readonly IProductionRepository _productionRepository; //鐢熶骇
+ private readonly IDt_StationManagerRepository _stationManagerRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -57,7 +59,8 @@
IDt_AreaInfoRepository areaInfoRepository,
IAgingInOrOutInputService agingInOrOutInputService,
IStockInfoDetailRepository stockInfoDetailRepository,
- IProductionRepository productionRepository) : base(BaseDal)
+ IProductionRepository productionRepository,
+ IDt_StationManagerRepository stationManagerRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_outOrderRepository = outOrderRepository;
@@ -79,6 +82,7 @@
_agingInOrOutInputService = agingInOrOutInputService;
_stockInfoDetailRepository = stockInfoDetailRepository;
_productionRepository = productionRepository;
+ _stationManagerRepository = stationManagerRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -93,13 +97,15 @@
{
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);
-
- var agingOutputDto = MapToAgingOutputDto(stock, info);
- content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
- ValidateResponse(content);
+ //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鍑哄叆绔�
+ {
+ var agingOutputDto = MapToAgingOutputDto(stock);
+ content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
+ ValidateResponse(content);
+ }
}
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
@@ -123,31 +129,37 @@
}
}
- private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info)
+ private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info = null)
{
// TODO Value鍊兼牴鎹甅OM涓嬪彂鐨勯潤缃椂闂村埌褰撳墠鏃堕棿鐨勫垎閽熸暟
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
+ if (area == null)
+ {
+ throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
+ }
return new AgingOutputDto
{
OpFlag = 1,
- Software = "WMS",
- EquipmentCode = "24MEJQ08-1091",
+ Software = area.Spare3,
+ EquipmentCode = area.Spare2,
TrayBarcode = stock.PalletCode,
SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto
{
SlotNo = x.OrderNo.ToInt32(),
SerialNo = x.SerialNumber,
SerialNoResult = true,
- ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()
- {
- LowerLomit = y.LowerControlLimit,
- UpperLimit = y.UpperControlLimit,
- ParameterResult = y.EquipmentAvailabilityFlag,
- ParameterCode = y.ParameterCode,
- ParameterDesc = y.Description,
- TargetValue = y.TargetValue,
- Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
- DefectCode = y.UOMCode
- }).ToList()
+ ParameterInfo = new List<ParameterInfo> { new ParameterInfo() { Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString() } }
+ //ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()
+ //{
+ // LowerLomit = y.LowerControlLimit,
+ // UpperLimit = y.UpperControlLimit,
+ // ParameterResult = y.EquipmentAvailabilityFlag,
+ // ParameterCode = y.ParameterCode,
+ // ParameterDesc = y.Description,
+ // TargetValue = y.TargetValue,
+ // Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
+ // DefectCode = y.UOMCode
+ //}).ToList()
}).ToList()
};
}
@@ -289,6 +301,7 @@
// 璁板綍寮傚父淇℃伅鍒版帶鍒跺彴鍜屾棩蹇�
Console.WriteLine(err.Message.ToString());
LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, err);
+ content.Error(err.Message);
}
return content;
}
@@ -327,7 +340,11 @@
private DtStockInfo CreateFullPalletStock(Dt_Task task, DtLocationInfo locationInf, DtBoxingInfo boxing)
{
var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
+ if (loation == null)
+ throw new Exception("鏈壘鍒板搴斾綅缃俊鎭�");
var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+ if (area == null)
+ throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
var stock = new DtStockInfo()
@@ -341,26 +358,27 @@
LocationId = loation.Id,
StockInfoDetails = boxDetail,
};
-
- // 澶勭悊璇锋眰鍙傛暟
- AgingInputDto agingInputDto = new AgingInputDto()
+ if (!task.Roadway.Contains("FR")) //闈炲垎瀹瑰簱鍖哄潎涓婃姤MOM鍑哄叆绔�
{
- SerialNos = boxing.BoxingInfoDetails
- .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
- .ToList(),
- TrayBarcode = task.PalletCode,
- OpFlag = 1,
- EquipmentCode = "24MEJQ08-1091",
- Software = "WMS"
- };
- 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).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
- stock.ProductionLine = respone.ProductionLine;
-
+ // 澶勭悊璇锋眰鍙傛暟
+ 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).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
+ stock.ProductionLine = respone.ProductionLine;
+ }
// 璁板綍鏃ュ織
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
@@ -391,6 +409,11 @@
return content.Error("浠诲姟涓嶅瓨鍦�");
}
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉浠诲姟鏄惁瀛樺湪", JsonConvert.SerializeObject(task));
+
+ if(task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
+ {
+ return await CompleteInToOutTaskAsync(task);
+ }
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
@@ -452,13 +475,17 @@
}
}
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));
+ if (area == null)
+ return content.Error("鏀圭偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
+
// 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
{
- Software = "WMS",
+ Software = area.Spare3,
TrayBarcode = input.PalletCode,
//EquipmentCode = "EQ_CWJZ01"
- EquipmentCode = "24MEJQ08-1091"
+ EquipmentCode = area.Spare2
};
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
@@ -487,6 +514,12 @@
// 濡傛灉process涓簄ull锛屽垯杩斿洖content
if (process == null) return content;
+
+ // 骞惰祴鍊间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
+ process.Software = area.Spare3;
+ process.EquipmentCode = area.Spare2;
+
+ // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
// 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
content = await _processApplyService.GetProcessApplyAsync(process);
@@ -615,8 +648,6 @@
// 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
return new ProcessApplyDto()
{
- EquipmentCode = "24MEJQ08-1091",
- Software = "WMS",
//WipOrderNo = result.BindCode,
SerialNos = content.SerialNos.Select(item => new SerialNos
{
@@ -1327,7 +1358,7 @@
}
else
{
- 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.LocationType ==*/);
}
if (locations == null)
--
Gitblit v1.9.3