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 | 1425 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 1,000 insertions(+), 425 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 2434b72..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,156 +1,232 @@
-锘縩amespace WIDESEA_StorageOutTaskServices;
+锘�
+using Mapster;
+using Masuit.Tools;
+using WIDESEA_DTO.MOM;
+using WIDESEA_DTO.WMS;
+using WIDESEA_IServices;
+using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_StorageBasicRepository;
+using WIDESEAWCS_BasicInfoRepository;
-public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
+namespace WIDESEA_StorageOutTaskServices;
+
+public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
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; //缁勭洏
+ private readonly ICellStateService _cellStateService; //鐢佃姱灞炴��
+ private readonly IProcessApplyService _processApplyService; //宸ヨ壓璺嚎
+ private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
+ private readonly IAgingInOrOutInputService _agingInOrOutInputService; //闈欑疆\闄堝寲
+ 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) : base(BaseDal)
+ ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
+ IBoxingInfoRepository boxingInfoRepository,
+ ICellStateService cellStateService,
+ IProcessApplyService processApplyService,
+ IDt_AreaInfoRepository areaInfoRepository,
+ IAgingInOrOutInputService agingInOrOutInputService,
+ IStockInfoDetailRepository stockInfoDetailRepository,
+ 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;
+ _cellStateService = cellStateService;
+ _processApplyService = processApplyService;
+ _areaInfoRepository = areaInfoRepository;
+ _agingInOrOutInputService = agingInOrOutInputService;
+ _stockInfoDetailRepository = stockInfoDetailRepository;
+ _stationManagerRepository = stationManagerRepository;
+ _configService = configService;
}
#region 澶栭儴鎺ュ彛鏂规硶
- /// <summary>
- /// 鍫嗗灈鏈哄嚭搴撲换鍔″畬鎴�
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
+ #region 鍑哄簱浠诲姟瀹屾垚
+
+
public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
{
WebResponseContent content = new WebResponseContent();
try
{
- // 鏇存柊搴撳瓨鐘舵��
- // 璁剧疆搴撲綅鐘舵�佷负绌洪棽
- stock.LocationInfo.LocationStatus = LocationEnum.Free.ObjToInt();
- // 璁剧疆搴撳瓨鐘舵�佷负鍑哄簱
- stock.StockInfoDetails.ForEach(x =>
+ if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- x.Status = 2;
- });
+ //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);
+ var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+ if (!result.Success)
+ {
+ task.Remark = "NG";
+ }
+ }
+ }
- // 鏇存柊浠诲姟鐘舵��
- task.TaskState = OutTaskStatusEnum.SC_OutFinish.ObjToInt();
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = task.TargetAddress;
-
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
+ // 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
+ (var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
// 浜嬪姟澶勭悊
- // 寮�濮嬩簨鍔�
- _unitOfWorkManage.BeginTran();
- // 鏇存柊搴撳瓨淇℃伅
- var isStockUpdated = _stockInfoRepository.UpdateData(stock);
- // 鏇存柊浠诲姟淇℃伅
- var isTaskUpdated = await Update(task);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await UpdateLocationAsync(loc);
+ await DeleteStockInfoAsync(stock.Id);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ if (task.Roadway.Contains("FR") || task.Roadway.Contains("GW")) //濡傛灉鏄垎瀹规垨楂樻俯鍑哄簱 灏嗕换鍔″垹闄�
+ await DeleteTaskAsync(task.TaskId);
+ });
- // 濡傛灉搴撳瓨淇℃伅鍜屼换鍔′俊鎭兘鏇存柊鎴愬姛
- if (isStockUpdated && isTaskUpdated)
- {
- // 璁板綍鏃ュ織
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", $"浜嬪姟澶勭悊瀹屾垚锛屽簱瀛樼姸鎬佹洿鏂帮細{isStockUpdated}锛屼换鍔＄姸鎬佹洿鏂�:{isTaskUpdated}");
- // 鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- // 杩斿洖鎴愬姛缁撴灉
- return content.OK("浠诲姟瀹屾垚鎴愬姛");
- }
- else
- {
- // 璁板綍鏃ュ織
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", $"浜嬪姟澶勭悊澶辫触锛屽簱瀛樼姸鎬佹洿鏂帮細{isStockUpdated}锛屼换鍔＄姸鎬佹洿鏂�:{isTaskUpdated}");
- // 鍥炴粴浜嬪姟
- _unitOfWorkManage.RollbackTran();
- // 杩斿洖澶辫触缁撴灉
- return content.Error("浠诲姟鎴栧簱瀛樻洿鏂板け璐�");
- }
+ return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
}
catch (Exception err)
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "");
- Console.WriteLine(err.Message);
+ LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, $"绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}");
return content.Error(err.Message);
}
}
- /// <summary>
- /// 鎬诲嚭搴撲换鍔″畬鎴�
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task, DtStockInfo stock)
+ private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info = null)
{
- WebResponseContent content = new WebResponseContent();
-
- try
+ // TODO Value鍊兼牴鎹甅OM涓嬪彂鐨勯潤缃椂闂村埌褰撳墠鏃堕棿鐨勫垎閽熸暟
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
+ if (area == null)
{
- // 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樿揣浣嶄俊鎭�
- var orderStock = await UpdateOrderAndStockAsync(stock, task.PalletCode);
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�", $"鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樿揣浣嶄俊鎭�:{JsonConvert.SerializeObject(orderStock)}");
-
- // 妫�鏌ヨ鍗曟槸鍚﹀畬鎴愬苟澶勭悊鍚庣画鎿嶄綔
- if (IsOrderComplete(orderStock))
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�", $"璁㈠崟鍑哄簱瀹屾垚");
- // 澶勭悊宸插畬鎴愯鍗�
- await ProcessCompletedOrderAsync(orderStock, task);
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�", $"璁㈠崟鏆傛湭鍑哄簱瀹屾垚");
- // 澶勭悊鏈畬鎴愯鍗�
- await ProcessUpdateOrderAsync(orderStock, task);
- }
-
- content.OK("浠诲姟瀹屾垚");
- }
- catch (Exception err)
- {
- // 璁板綍寮傚父淇℃伅
- Console.WriteLine(err.Message.ToString());
- content.Error("浠诲姟瀹屾垚澶辫触");
+ throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
}
- return content;
+ 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;
+
+ //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,
+ 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 = new List<ParameterInfoOutput> {
+ new ParameterInfoOutput() {
+ Value = outHours.ToString(),
+ ParameterCode =parameterInfo.ParameterCode,
+ ParameterDesc = parameterInfo.Description,
+ ParameterResult = isNG.ToString(),
+ TargetValue = parameterInfo.TargetValue,
+ LowerLomit = parameterInfo.LowerSpecificationsLimit,
+ UpperLimit = parameterInfo.UpperSpecificationsLimit,
+ DefectCode = defectCode
+ }
+ }
+ }).ToList()
+ };
}
+
+ 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);
+
+ location.LocationStatus = (int)LocationEnum.Free;
+ task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ //task.CurrentAddress = task.NextAddress;
+ //task.NextAddress = task.TargetAddress;
+
+ LogFactory.GetLog("浠诲姟瀹屾垚").Info(true, "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
+ return (location, task);
+ }
+
+ private async Task DeleteStockInfoAsync(int stockId)
+ {
+ var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(stockId);
+ if (!isStockUpdated)
+ {
+ throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task UpdateLocationAsync(DtLocationInfo info)
+ {
+ var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
+ if (!isStockUpdated)
+ {
+ throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
+ {
+ var ids = details.Select(x => (object)x.Id).ToArray();
+ var isStockDetailUpdated = await _stockInfoDetailRepository.DeleteDataByIdsAsync(ids);
+ if (!isStockDetailUpdated)
+ {
+ throw new Exception("搴撳瓨璇︽儏淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task DeleteTaskAsync(int taskId)
+ {
+ var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(taskId);
+ if (!isTaskUpdated)
+ {
+ throw new Exception("浠诲姟淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ #endregion 鍑哄簱浠诲姟瀹屾垚
+
+ #region 绉诲簱浠诲姟瀹屾垚
/// <summary>
/// 绉诲簱浠诲姟瀹屾垚
@@ -181,53 +257,199 @@
return content;
}
+ #endregion 绉诲簱浠诲姟瀹屾垚
+
+ #region 鍏ュ簱浠诲姟瀹屾垚
+
/// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚
+ /// 瀹屾垚鍏ュ簱浠诲姟
/// </summary>
/// <param name="task">浠诲姟鏁版嵁鍚堥泦</param>
/// <returns>杩斿洖缁撴灉闆�</returns>
public async Task<WebResponseContent> CompleteInboundTaskAsync(Dt_Task task)
{
+ // 鍒濆鍖栧搷搴斿唴瀹�
WebResponseContent content = new WebResponseContent();
try
{
- // 鍒涘缓搴撳瓨瀹炰緥妯″瀷
- DtStockInfo stock = new DtStockInfo()
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
{
+ task.TaskState = (int)TaskInStatusEnum.SC_InFinish;
+ // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
+ var taskHtyNG = CreateHistoricalTask(task);
- };
+ // 鎵ц鏁版嵁搴撲簨鍔�
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHtyNG) > 0;
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var isTaskDelete = await Delete(task.TaskId);
+ if (!isTaskHtyAdd || !isTaskDelete)
+ throw new Exception("娣诲姞澶辫触");
+ });
+ return content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ }
+
+ // 鑾峰彇瑁呯淇℃伅鍜岀洰鏍囦綅缃俊鎭�
+ var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
+ var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);
+
+ // 鏇存柊鐩爣浣嶇疆鐘舵�佷负搴撳瓨涓�
+ locationInf.LocationStatus = (int)LocationEnum.InStock;
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
var taskHty = CreateHistoricalTask(task);
- // 淇敼璐т綅淇℃伅涓烘湁璐�
- var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
- locationInf.LocationStatus = (int)LocationEnum.Lock;
+ // 鏍规嵁鏄惁鏈夌粍鐩樹俊鎭垱寤哄簱瀛樺疄渚嬫ā鍨�
+ DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
// 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
+ bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);
if (isResult)
+ {
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ }
else
+ {
content.Error("鍏ュ簱浠诲姟瀹屾垚澶辫触");
+ }
}
catch (Exception err)
{
+ // 璁板綍寮傚父淇℃伅鍒版帶鍒跺彴鍜屾棩蹇�
Console.WriteLine(err.Message.ToString());
+ LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, err);
+ content.Error(err.Message);
}
return content;
}
/// <summary>
- /// 浠诲姟瀹屾垚
+ /// 鍒涘缓绌烘墭鐩樼殑搴撳瓨瀹炰緥妯″瀷
/// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
+ private DtStockInfo CreateEmptyPalletStock(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.宸插叆搴�
+ }
+ }
+ };
+ }
+
+ /// <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.宸插叆搴�
+ }
+ }
+ };
+ }
+
+ /// <summary>
+ /// 鍒涘缓瀹炵洏鐨勫簱瀛樺疄渚嬫ā鍨嬪苟璋冪敤MOM鍏ュ簱
+ /// </summary>
+ 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()
+ {
+ PalletCode = task.PalletCode,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFull = boxing.IsFull,
+ AreaCode = area.AreaCode,
+ LocationId = loation.Id,
+ StockInfoDetails = boxDetail,
+ };
+
+ // 澶勭悊璇锋眰鍙傛暟
+ AgingInputDto agingInputDto = new AgingInputDto()
+ {
+ SerialNos = boxing.BoxingInfoDetails
+ .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
+ .ToList(),
+ TrayBarcode = task.PalletCode,
+ OpFlag = 1,
+ EquipmentCode = area.Spare2,
+ Software = area.Spare3
+ };
+ var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
+ var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
+ stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
+ stock.SpecialParameterDuration = respone.SpecialParameterDuration;
+ //2024骞�11鏈�16鏃ワ細鏂板瀛楁璁＄畻搴斿嚭搴撴椂闂�
+ stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime == null ? DateTime.Now : respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
+ stock.ProductionLine = respone.ProductionLine;
+ stock.ParameterInfos = respone.ParameterInfos.ToJsonString();
+ stock.StockStatus = 1;
+
+ // 璁板綍鏃ュ織
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
+
+ return stock;
+ }
+
+ #endregion 鍏ュ簱浠诲姟瀹屾垚
+
+ #region 浠诲姟瀹屾垚
+
+ /// <summary>
+ /// 瀹屾垚浠诲姟
+ /// </summary>
+ /// <param name="taskNum">浠诲姟缂栧彿</param>
+ /// <returns>杩斿洖缁撴灉闆�</returns>
public async Task<WebResponseContent> CompleteAsync(int taskNum)
{
+ // 鍒濆鍖栧搷搴斿唴瀹�
WebResponseContent content = new WebResponseContent();
+
// 鎻愬彇浠诲姟鏁版嵁
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎻愬彇浠诲姟鏁版嵁", $"浠诲姟鍙凤細{taskNum}");
@@ -239,90 +461,537 @@
}
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉浠诲姟鏄惁瀛樺湪", JsonConvert.SerializeObject(task));
- // 楠岃瘉搴撳瓨鏄惁瀛樺湪
- var stock = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == task.PalletCode);
- if (stock == null)
+ if (task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "搴撳瓨涓嶅瓨鍦ㄥ瓨鍦紝鍒ゆ柇鏄惁鏄叆搴撲换鍔�", $"{task.TaskType}");
- if (task.TaskType == (int)TaskTypeEnum.Inbound)
- {
+ return await CompleteInToOutTaskAsync(task);
+ }
+
+ // 楠岃瘉搴撳瓨鏄惁瀛樺湪
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
+
+ // 鏍规嵁浠诲姟绫诲瀷璋冪敤鐩稿簲鐨勫畬鎴愪换鍔℃柟娉�
+ switch (task.TaskType)
+ {
+ case (int)TaskInboundTypeEnum.Inbound:
+ case (int)TaskInboundTypeEnum.InTray:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
return await CompleteInboundTaskAsync(task);
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "搴撳瓨涓嶅瓨鍦ㄤ篃涓嶆槸鍏ュ簱浠诲姟", "");
- return content.Error("搴撳瓨涓嶅瓨鍦�");
- }
- }
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉搴撳瓨鏄惁瀛樺湪", JsonConvert.SerializeObject(stock));
- if (task.TaskType == (int)TaskTypeEnum.Outbound)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
- if (task.TaskState == OutTaskStatusEnum.SC_OutExecuting.ObjToInt())
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", "");
+ case (int)TaskOutboundTypeEnum.OutTray:
+ case (int)TaskOutboundTypeEnum.Outbound:
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
return await CompleteStackTaskAsync(task, stock);
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�", "");
- return await CompleteTaskAsync(task, stock);
- }
- }
- else if (task.TaskType == (int)TaskTypeEnum.RelocationIn)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", "");
- return await CompleteTransferTaskAsync(task, stock);
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟鐘舵�佸紓甯�", "鏃犲弬鏁�");
- return content.Error("浠诲姟鐘舵�佸紓甯�");
+
+ default:
+ return content.Error("浠诲姟绫诲瀷涓嶅瓨鍦�");
}
}
+ #endregion 浠诲姟瀹屾垚
+
+ #region 璇锋眰浠诲姟鍏ュ簱
+
/// <summary>
- /// 璇锋眰浠诲姟
+ /// 璇锋眰浠诲姟宸烽亾
/// </summary>
/// <param name="input">璇锋眰妯″瀷</param>
/// <returns>鍖呭惈浠诲姟淇℃伅鐨勫搷搴斿唴瀹�</returns>
public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
{
+ // 鍒涘缓涓�涓猈ebResponseContent瀵硅薄
WebResponseContent content = new WebResponseContent();
try
{
- // 鏍规嵁鎵樼洏鑾峰彇搴撳瓨淇℃伅
- var stockInfo = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
-
- // 鑾峰彇浠撳簱鍖哄煙淇℃伅
- var areaInfo = await _wareAreaInfoRepository.QueryFirstAsync(x => x.WareAreaCode == input.AreaCode);
-
- // 鏌ヨ鏄惁宸叉湁浠诲姟
+ // 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
-
if (task != null)
{
- // 鏇存柊鐜版湁浠诲姟
- content = await UpdateExistingTask(input, areaInfo.AreaID, task);
+ //if (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,
+ };
+ return content.OK(data: taskDTO);
+ }
}
- else
+
+
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
+ if (stock != null)
{
- // 鍒涘缓鏂颁换鍔�
- content = await CreateNewTask(input, areaInfo.AreaID);
+ // TODO璐ㄦ鍥炲簱
+ }
+
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));
+ if (area == null)
+ return content.Error("鏀圭偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
+
+ // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+ TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ {
+ Software = area.Spare3,
+ TrayBarcode = input.PalletCode,
+ //EquipmentCode = "EQ_CWJZ01"
+ EquipmentCode = area.Spare2
+ };
+
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ if (!content.Status) return content;
+
+ // 娣诲姞缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (!result.Success)
+ return content.Error(result.MOMMessage);
+
+ // 鑾峰彇寮傚父鐢佃姱
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+ if (serialNosError.Count > 0)
+ {
+ // TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
+ 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("瀛樺湪寮傚父鐢佃姱");
+ }
+
+ if (result.SerialNos.Count <= 0)
+ {
+ // Todo 绌烘墭鐩樺叆搴撻�昏緫
+ 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));
+ //if (productions.Count <= 0)
+ // return content.Error("鏂欐灞炴�т笉瀛樺湪");
+
+ // 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
+
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ //Console.WriteLine(boxing.ToJsonString());
+ if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+ // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
+ ProcessApplyDto process = await GetProcessApplyAsync(result);
+
+ // 濡傛灉process涓簄ull锛屽垯杩斿洖content
+ if (process == null) return content;
+
+ // 骞惰祴鍊间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
+ process.Software = area.Spare3;
+ process.EquipmentCode = area.Spare2;
+
+ // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+
+ // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+ content = await _processApplyService.GetProcessApplyAsync(process);
+
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+ if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+ var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
+ if ((resultProcessApply.Success)) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+ 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" };
+ 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)
+ {
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
}
}
catch (Exception err)
{
- // 閿欒澶勭悊
+ // 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
content.Error(err.Message);
Console.WriteLine(err.Message);
}
+ // 杩斿洖content
return content;
}
+
+ /// <summary>
+ /// 鏇存柊浠诲姟璐т綅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
+ if (task == null)
+ return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
+
+ return content = await UpdateExistingTask(input, task);
+
+ }
+ catch (Exception err)
+ {
+
+ throw;
+ }
+ }
+
+ /// <summary>
+ /// 绌烘墭鐩樺叆搴撶敵璇�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> RequestTrayInTaskAsync(RequestTaskDto input)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+
+ // 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
+ if (task != null && task.TaskState == (int)TaskInStatusEnum.InNew)
+ {
+ // 鍒涘缓WMS浠诲姟
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.Roadway,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = task.TaskType,
+ };
+ 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 = stationManagers.Select(x => x.Roadway).ToList();
+
+ return await CreateNewTask(input, strings, 1);
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+ }
+
+ // 鑾峰彇鎵樼洏鍗曞厓鏍肩姸鎬�
+ private async Task<WebResponseContent> GetTrayCellStatusAsync(TrayCellsStatusDto trayCells)
+ {
+ // 璋冪敤_cellStateService.GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨墭鐩樺崟鍏冩牸鐘舵��
+ return await _cellStateService.GetTrayCellStatusAsync(trayCells);
+ }
+
+ // 鑾峰彇缁勭洏淇℃伅
+ 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,
+ OrderNo = serialNoObj.PositionNo.ToString(),
+ Status = serialNoObj.SerialNoStatus,
+ MaterielCode = result.BindCode,
+ Remark = result.TrayBarcodePropertys.ToJsonString(),
+ }).ToList()
+ };
+ }
+
+ // 鑾峰彇宸ヨ壓鐢宠
+ private async Task<ProcessApplyDto> GetProcessApplyAsync(ResultTrayCellsStatus content)
+ {
+ // 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
+ return new ProcessApplyDto()
+ {
+ //WipOrderNo = result.BindCode,
+ SerialNos = content.SerialNos.Select(item => new SerialNos
+ {
+ SerialNo = item.SerialNo
+ }).ToList()
+ };
+ }
+
+ #endregion 璇锋眰浠诲姟鍏ュ簱
+
+ #region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
+
+ /// <summary>
+ /// 璇锋眰鎵樼洏浠诲姟
+ /// </summary>
+ /// <param name="position">鐩爣浣嶇疆</param>
+ /// <param name="tag">鎵樼洏绫诲瀷锛�1锛氬疄鐩橈紝2锛氱┖鐩橈級</param>
+ /// <param name="areaCode">鍖哄煙缂栫爜</param>
+ /// <param name="roadways">宸烽亾缂栫爜闆嗗悎</param>
+ /// <returns>杩斿洖缁撴灉闆�</returns>
+ public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> roadways)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ // 鏍规嵁鎵樼洏绫诲瀷鏌ヨ搴撳瓨淇℃伅
+ DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
+ ? QueryStockInfoForRealTrayAsync(areaCode, roadways).Result
+ : QueryStockInfoForEmptyTrayAsync(areaCode, roadways).Result;
+
+ if (stockInfo == null)
+ {
+ return content.Error("搴撳瓨淇℃伅涓嶅瓨鍦�");
+ }
+
+ // 鏂板閲嶅浠诲姟鏍￠獙
+ var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
+ if (hasTask != null)
+ {
+ WMSTaskDTO taskDTO1 = CreateTaskDTO(hasTask);
+ return content.OK("宸插瓨鍦ㄥ嚭搴撲换鍔�", data: taskDTO1);
+ }
+
+ // 鍒涘缓鏂颁换鍔″疄渚�
+ var task = CreateTask(stockInfo, position, tag);
+ var taskId = await BaseDal.AddDataAsync(task);
+ bool isResult = taskId > 0;
+ if (!isResult)
+ {
+ return content.Error("浠诲姟鍒涘缓澶辫触");
+ }
+
+ // 鍒涘缓浠诲姟DTO
+ WMSTaskDTO taskDTO = CreateTaskDTO(task);
+ //if (tag == 1)
+ {
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
+ }
+
+ // 杩斿洖鎴愬姛鍝嶅簲
+ return content.OK(data: taskDTO);
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父淇℃伅骞舵姏鍑�
+ LogFactory.GetLog("璇锋眰鎵樼洏浠诲姟").Error(true, ex);
+ return content.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鏌ヨ瀹炵洏搴撳瓨淇℃伅
+ /// </summary>
+ private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)
+ {
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+
+ var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
+ .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
+ .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+ .OrderBy(x => x.OutboundTime) // 鎺掑簭
+ .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
+
+ //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+ //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+ //return firstOrDefault;
+ return result;
+ }
+
+ /// <summary>
+ /// 鏌ヨ绌虹洏搴撳瓨淇℃伅
+ /// </summary>
+ private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)
+ {
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+
+ var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
+ .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
+ .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) // 杩囨护鏉′欢
+ .OrderBy(x => x.CreateDate) // 鎺掑簭
+ .FirstAsync(); // 杞崲涓哄垪琛�
+
+ //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+ //return firstOrDefault;
+ return result;
+ }
+
+ /// <summary>
+ /// 鍒涘缓浠诲姟瀹炰緥
+ /// </summary>
+ private Dt_Task CreateTask(DtStockInfo stockInfo, string position, int tag)
+ {
+ return new Dt_Task
+ {
+ Grade = 1,
+ Roadway = stockInfo.LocationInfo.RoadwayNo,
+ TargetAddress = position,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = position,
+ OrderNo = null,
+ PalletCode = stockInfo.PalletCode,
+ SourceAddress = stockInfo.LocationCode,
+ CurrentAddress = stockInfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = tag == (int)TaskOutboundTypeEnum.Outbound ? (int)TaskOutboundTypeEnum.Outbound : (int)TaskOutboundTypeEnum.OutTray,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ Creater = "System", // 淇鎷煎啓閿欒
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ };
+ }
+
+ /// <summary>
+ /// 鍒涘缓浠诲姟DTO
+ /// </summary>
+ private WMSTaskDTO CreateTaskDTO(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,
+ };
+ }
+
+ #endregion 璇锋眰鍑哄簱
+
+ #region 浠诲姟鐘舵�佹洿鏀�
+
+ /// <summary>
+ /// 鏇存柊浠诲姟鐘舵��&鍑哄簱瑙ｇ洏
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="taskState"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> UpdateTaskStatus(int taskNum, int taskState)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
+ if (task == null)
+ return content.Error("鏈壘鍒颁换鍔�");
+
+ if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish)
+ {
+ var taskHty = CreateHistoricalTask(task);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
+ var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+ if (asb && asbHty)
+ content.OK();
+ else
+ throw new Exception();
+ });
+ content.OK();
+ }
+ else
+ {
+ task.TaskState = taskState;
+ var asb = await BaseDal.UpdateDataAsync(task);
+ if (asb)
+ content.OK();
+ else
+ content.Error();
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ #endregion
+
+ #region 鍑哄簱瑙ｇ洏
+
+ /// <summary>
+ /// 鍑哄簱瑙ｇ洏鎺ュ彛
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> OutUnblockInterface(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
+ if (task == null)
+ return content.Error("鏈壘鍒颁换鍔�");
+ task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
+ var taskHty = CreateHistoricalTask(task);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ #endregion
#endregion 澶栭儴鎺ュ彛鏂规硶
@@ -425,7 +1094,7 @@
/// <returns>鏄惁鏇存柊鎴愬姛</returns>
public async Task<bool> Update(Dt_Task model)
{
- return await BaseDal.Update(model);
+ return await BaseDal.UpdateDataAsync(model);
}
/// <summary>
@@ -435,7 +1104,7 @@
/// <returns>鏄惁鏇存柊鎴愬姛</returns>
public async Task<bool> Update(List<Dt_Task> models)
{
- return await BaseDal.Update(models);
+ return await BaseDal.UpdateDataAsync(models);
}
/// <summary>
@@ -455,7 +1124,7 @@
/// <returns></returns>
public async Task<Dt_Task> GetByLocation(string locationID)
{
- return await Db.Queryable<Dt_Task>().Where(x => x.SourceAddress == locationID).FirstAsync();
+ return await BaseDal.QueryFirstAsync(x => x.SourceAddress == locationID);
}
/// <summary>
@@ -465,165 +1134,12 @@
/// <returns></returns>
public async Task<Dt_Task> GetByTaskNum(int taskNum)
{
- return await Db.Queryable<Dt_Task>().Where(x => x.TaskNum == taskNum).FirstAsync();
+ return await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
}
#endregion 鍐呴儴璋冪敤鏂规硶
#region private 鍐呴儴鏂规硶
-
- /// <summary>
- /// 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樹俊鎭�
- /// </summary>
- /// <param name="stock">搴撳瓨瀹炰緥</param>
- /// <param name="barCode">鏉＄爜</param>
- /// <returns>鏇存柊鍚庣殑璁㈠崟鍜屽簱瀛樹俊鎭�</returns>
- private async Task<Dt_OutOrderAndStock> UpdateOrderAndStockAsync(DtStockInfo stock, string barCode)
- {
- 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="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <param name="task">浠诲姟鏁版嵁</param>
- /// <returns>寮傛浠诲姟</returns>
- private async Task ProcessCompletedOrderAsync(Dt_OutOrderAndStock orderStock, Dt_Task task)
- {
- // 鍒涘缓鍘嗗彶璁㈠崟璁板綍
- var stockHty = CreateHistoricalOrder(orderStock);
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�,璁㈠崟宸插畬鎴�", $"鍒涘缓鍘嗗彶璁㈠崟璁板綍锛歿JsonConvert.SerializeObject(stockHty)}");
-
- // 鍒涘缓鑾峰彇鍘嗗彶浠诲姟
- var taskHty = CreateHistoricalTask(task);
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�,璁㈠崟宸插畬鎴�", $"鍒涘缓鍘嗗彶浠诲姟璁板綍锛歿JsonConvert.SerializeObject(taskHty)}");
-
- _unitOfWorkManage.BeginTran();
-
- try
- {
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
-
- // 鍒犻櫎浠诲姟鏁版嵁
- var isTaskDelete = await Delete(task.TaskId);
-
- // 鎻掑叆鍘嗗彶璁㈠崟
- var isStockInsert = _outOrderAndStock_HtyRepository.InsertNav(stockHty);
-
- // 鍒犻櫎鍘熻鍗�
- var isOrderStockDelete = _outOrderAndStockRepository.DeleteNavOrderStock(orderStock);
-
- if (isStockInsert && isOrderStockDelete && isTaskHtyAdd && isTaskDelete)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�,璁㈠崟宸插畬鎴�", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鎻掑叆鍘嗗彶璁㈠崟锛歿isStockInsert},鍒犻櫎鍘熻鍗�:{isOrderStockDelete}");
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�,璁㈠崟宸插畬鎴�", $"娣诲姞鏁版嵁搴撳け璐�,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鎻掑叆鍘嗗彶璁㈠崟锛歿isStockInsert},鍒犻櫎鍘熻鍗�:{isOrderStockDelete}");
- _unitOfWorkManage.RollbackTran();
- }
- }
- catch (Exception ex)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"鎬讳换鍔″嚭搴撳畬鎴�,璁㈠崟宸插畬鎴�,绯荤粺寮傚父锛屽紓甯镐俊鎭細{ex.Message}", "鏃犲弬鏁�");
- _unitOfWorkManage.RollbackTran();
- throw; // 閲嶆柊鎶涘嚭寮傚父浠ヤ緵澶栭儴鎹曡幏
- }
- }
-
- /// <summary>
- /// 澶勭悊鏈畬鎴愯鍗�
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <param name="task">浠诲姟鏁版嵁</param>
- /// <returns>寮傛浠诲姟</returns>
- private async Task ProcessUpdateOrderAsync(Dt_OutOrderAndStock orderStock, Dt_Task task)
- {
- // 鍒涘缓鑾峰彇鍘嗗彶浠诲姟
- var taskHty = CreateHistoricalTask(task);
-
- _unitOfWorkManage.BeginTran();
- try
- {
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
-
- // 鍒犻櫎浠诲姟鏁版嵁
- var isTaskDelete = await Delete(task.TaskId);
-
- // 鏇存柊璁㈠崟涓庡簱瀛�
- var isOrderUpdated = _outOrderAndStockRepository.UpdateNavOrderStock(orderStock);
- if (isTaskDelete && isTaskHtyAdd && isOrderUpdated)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�,璁㈠崟鏆傛湭瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊璁㈠崟涓庡簱瀛橈細{isOrderUpdated}");
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�,璁㈠崟鏆傛湭瀹屾垚", $"娣诲姞鏁版嵁搴撳け璐�,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊璁㈠崟涓庡簱瀛橈細{isOrderUpdated}");
- _unitOfWorkManage.RollbackTran();
- }
- }
- catch (Exception err)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"鎬讳换鍔″嚭搴撳畬鎴�,璁㈠崟鏆傛湭瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
- Console.WriteLine(err.Message.ToString());
- _unitOfWorkManage.RollbackTran();
- throw; // 閲嶆柊鎶涘嚭寮傚父浠ヤ緵澶栭儴鎹曡幏
- }
- }
-
- /// <summary>
- /// 鍒涘缓鍘嗗彶璁㈠崟璁板綍
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <returns>鍘嗗彶璁㈠崟璁板綍</returns>
- private Dt_OutOrderAndStock_Hty CreateHistoricalOrder(Dt_OutOrderAndStock orderStock)
- {
- var stockHty = _mapper.Map<Dt_OutOrderAndStock_Hty>(orderStock);
-
- //stockHty.StockList.FinishTime = DateTime.Now;
- //stockHty.StockList.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
- //stockHty.StockList.SourceId = orderStock.StockList.GroupId;
- //stockHty.StockList.GroupId = 0;
-
- //stockHty.StockList.StockDetailList.ForEach(x =>
- //{
- // x.FinishTime = DateTime.Now;
- // x.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
- // x.GroupId = 0;
- //});
-
- stockHty.OrderList.FinishTime = DateTime.Now;
- stockHty.OrderList.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
- stockHty.OrderList.SourceId = orderStock.OrderList.Id;
- stockHty.OrderList.Id = 0;
-
- stockHty.OrderList.orderDetailList.FinishTime = DateTime.Now;
- stockHty.OrderList.orderDetailList.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
- stockHty.OrderList.orderDetailList.Id = 0;
-
- return stockHty;
- }
/// <summary>
/// 鍒涘缓鍘嗗彶浠诲姟璁板綍
@@ -633,7 +1149,7 @@
private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
{
// 鏇存柊浠诲姟鐘舵��
- task.TaskState = OutTaskStatusEnum.OutFinish.ObjToInt();
+ task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
task.CurrentAddress = task.NextAddress;
// 鍒涘缓鍘嗗彶浠诲姟
@@ -642,7 +1158,7 @@
taskHty.TaskId = 0;
taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.SourceId = task.TaskId;
- taskHty.TaskState = OutTaskStatusEnum.OutFinish.ObjToInt();
+ taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
return taskHty;
}
@@ -651,14 +1167,20 @@
/// </summary>
/// <param name="stock">搴撳瓨瀵硅薄</param>
/// <param name="toLocation">鐩爣浣嶇疆</param>
+ // 鏇存柊搴撳瓨鍜屼綅缃俊鎭�
private (DtStockInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, string toLocation)
{
+ // 鑾峰彇搴撳瓨淇℃伅
var locationInfo = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
+ // 灏嗗簱瀛樼姸鎬佽缃负鍦ㄥ簱
locationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
+ // 灏嗗簱瀛樹綅缃缃负鐩爣浣嶇疆
stock.LocationCode = toLocation;
+ // 灏嗗簱瀛樼姸鎬佽缃负鍦ㄥ簱
stock.LocationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
+ // 杩斿洖鏇存柊鍚庣殑搴撳瓨鍜屼綅缃俊鎭�
return (stock, locationInfo);
}
@@ -669,12 +1191,13 @@
/// <param name="taskHty">鍘嗗彶浠诲姟瀵硅薄</param>
/// <param name="taskId">浠诲姟ID</param>
/// <returns></returns>
- private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId)
+ private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId, DtBoxingInfo boxingInfo = null)
{
_unitOfWorkManage.BeginTran();
try
{
var isUpdateStock = true;
+ var isDeleteBoxing = true;
if (taskHty.TaskType == (int)TaskTypeEnum.Outbound)
{
// 鏇存柊搴撳瓨
@@ -683,7 +1206,14 @@
else
{
// 娣诲姞搴撳瓨
- isUpdateStock = await _stockInfoRepository.AddDataAsync(stock) > 0;
+ isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
+ if (boxingInfo != null)
+ {
+ isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
+ .Include(x => x.BoxingInfoDetails)
+ .ExecuteCommandAsync();
+ }
+
}
// 娣诲姞鍘嗗彶浠诲姟
@@ -696,22 +1226,22 @@
var isTaskDelete = await Delete(taskId);
// 鎻愪氦鎴栧洖婊氫簨鍔�
- if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
+ if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc && isDeleteBoxing)
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
_unitOfWorkManage.CommitTran();
return true;
}
else
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"鏁版嵁澶勭悊澶辫触,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊搴撳瓨锛歿isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"鏁版嵁澶勭悊澶辫触,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊搴撳瓨锛歿isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
_unitOfWorkManage.RollbackTran();
return false;
}
}
catch (Exception err)
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"绉诲簱浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
_unitOfWorkManage.RollbackTran();
throw; // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
}
@@ -719,81 +1249,99 @@
#region 浠诲姟璇锋眰鏂规硶
- /// <summary>
- /// 鏇存柊鐜版湁浠诲姟
- /// </summary>
- /// <param name="input">璇锋眰妯″瀷</param>
- /// <param name="areaId">鍖哄煙ID</param>
- /// <param name="task">浠诲姟瀹炰緥</param>
- /// <param name="content">鍝嶅簲鍐呭</param>
- /// <returns></returns>
- private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, int areaId, Dt_Task task)
+ // 鏇存柊浠诲姟璐т綅
+
+ private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
{
- WebResponseContent content = new WebResponseContent();
- string toAddress;
- int taskState;
- string original = task.CurrentAddress;
- DtLocationInfo location = new DtLocationInfo();
- int beforeStatus = 0;
-
- if (input.Type == (int)TaskTypeEnum.Outbound)
+ if (task == null)
{
- // 澶勭悊鍑哄簱浠诲姟
- toAddress = await GetRoadWayAsync(areaId, task.Roadway, input.Direction, input.Area, input.Type);
- taskState = (int)OutTaskStatusEnum.SC_OutFinish;
- }
- else
- {
- // 澶勭悊鍏ュ簱浠诲姟
- location = await GetLocationDistributeAsync(areaId, task.Roadway);
- toAddress = location.LocationCode;
- taskState = (int)InTaskStatusEnum.Line_InFinish;
- beforeStatus = location.LocationStatus;
-
- // 鏇存柊璐т綅淇℃伅
- location.LocationStatus = (int)LocationEnum.Lock;
+ return new WebResponseContent().Error("浠诲姟瀵硅薄涓虹┖");
}
- // 鏇存柊浠诲姟淇℃伅
- task.SourceAddress = input.Position;
+ try
+ {
+ // 鍒涘缓WebResponseContent瀵硅薄
+ var content = new WebResponseContent();
+
+ // 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ {
+ // 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
+ {
+ var location = await GetLocationDistributeAsync(task.Roadway);
+ if (location == null)
+ {
+ return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+ }
+
+ 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}");
+ }
+ }
+
+ private void MapTaskProperties(Dt_Task task, RequestTaskDto input, string toAddress, int taskState)
+ {
task.CurrentAddress = input.Position;
task.TargetAddress = toAddress;
task.NextAddress = toAddress;
task.TaskState = taskState;
+ }
- _unitOfWorkManage.BeginTran();
- bool isUpdateLo = true;
- bool isUpdateChange = true;
-
- // 灏濊瘯鏇存柊浠诲姟
+ // 淇敼浠诲姟
+ private async Task<bool> UpdateTaskAsync(Dt_Task task, DtLocationInfo location, int beforeStatus)
+ {
bool isResult = await BaseDal.UpdateDataAsync(task);
- bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, InTaskStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
- if (input.Type != (int)TaskTypeEnum.Outbound)
- {
- LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
- {
- AfterStatus = location.LocationStatus,
- BeforeStatus = beforeStatus,
- TaskNum = task.TaskNum.Value,
- LocationId = location.Id,
- LocationCode = location.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
- };
- isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
- isUpdateLo = await _locationRepository.UpdateDataAsync(location);
- }
+ bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, task.CurrentAddress, task.TargetAddress, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
- if (isResult && isUpdateLo && isTaskDetail)
+ LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
{
- _unitOfWorkManage.CommitTran();
- content.OK(data: task);
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- content.Error("鏇存柊浠诲姟澶辫触");
- }
- return content;
+ AfterStatus = location.LocationStatus,
+ BeforeStatus = beforeStatus,
+ TaskNum = task.TaskNum.Value,
+ LocationId = location.Id,
+ LocationCode = location.LocationCode,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
+ };
+
+ bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
+ bool isUpdateLo = await _locationRepository.UpdateDataAsync(location);
+
+ return isResult && isUpdateLo && isTaskDetail;
}
/// <summary>
@@ -803,11 +1351,17 @@
/// <param name="areaId">鍖哄煙ID</param>
/// <param name="content">鍝嶅簲鍐呭</param>
/// <returns></returns>
- private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, int areaId)
+ private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, List<string> process = null, int flag = 0)
{
WebResponseContent content = new WebResponseContent();
+
// 鑾峰彇鐩爣鍦板潃
- string ToAddress = await GetRoadWayAsync(areaId, input.Position, input.Direction, input.Area, input.Type);
+ //string ToAddress = await GetRoadWayAsync(process);
+ string ToAddress = string.Empty;
+ if (flag != 2)
+ ToAddress = await GetRoadWayAsync(input, process);
+ else
+ ToAddress = process[0];
// 鍒涘缓鏂颁换鍔″疄渚�
var task = new Dt_Task
@@ -822,20 +1376,36 @@
OrderNo = null,
PalletCode = input.PalletCode,
SourceAddress = input.Position,
- TaskState = (int)InTaskStatusEnum.InNew,
- TaskType = (int)TaskTypeEnum.Inbound,
+ TaskState = (int)TaskInStatusEnum.InNew,
+ TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : (int)TaskInboundTypeEnum.InNG,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
+
// 灏濊瘯娣诲姞鏂颁换鍔�
var taskId = await BaseDal.AddDataAsync(task);
bool isResult = taskId > 0;
if (isResult)
{
task.TaskId = taskId;
- isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, InTaskStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
+ isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
if (isResult)
- content.OK(data: task);
+ {
+ // 鍒涘缓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,
+ };
+ content.OK(data: taskDTO);
+ }
else
content.Error("娣诲姞浠诲姟澶辫触");
}
@@ -847,16 +1417,25 @@
/// <summary>
/// 鏌ユ壘璐т綅
/// </summary>
- /// <param name="areaId">鍖哄煙涓婚敭</param>
+ /// <param name="IsFull">鍖哄煙涓婚敭</param>
/// <param name="roadWay">宸烽亾</param>
/// <returns></returns>
- public async Task<DtLocationInfo> GetLocationDistributeAsync(int areaId, string roadWay)
+ public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay, bool IsFull = true)
{
#region 鑾峰彇璐т綅
try
{
- var locations = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ List<DtLocationInfo> locations;
+ if (IsFull)
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ }
+ else
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay /*&& x.LocationType ==*/);
+ }
+
if (locations == null)
{
return null;
@@ -881,36 +1460,32 @@
/// <param name="Direction">鏂瑰悜</param>
/// <param name="area">鍏崇郴鍖哄煙</param>
/// <returns></returns>
- public async Task<string> GetRoadWayAsync(int areaId, string position, string Direction, string area, int type)
+ public async Task<string> GetRoadWayAsync(RequestTaskDto input, List<string> process)
{
- var point = new PointStackerRelation();
- if (type == (int)TaskTypeEnum.Inbound)
- {
- point = await _pointStackerRelationRepository.QueryFirstAsync(x => x.Direction == Direction && x.PointCode == position && x.Area == area);
- if (point == null) { return null; }
- var locationInfos = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && point.StackerCode.Contains(x.RoadwayNo));
- var groupWithMinCount = locationInfos.GroupBy(x => x.RoadwayNo).OrderBy(x => x.Count()).FirstOrDefault();
+ var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
+ .GroupBy(x => x.RoadwayNo)
+ .OrderByDescending(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
+ .First(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
- if (groupWithMinCount != null)
- return groupWithMinCount.Key;
- else
- return null;
- }
- else if (type == (int)TaskTypeEnum.Outbound)
- {
- point = await _pointStackerRelationRepository.QueryFirstAsync(x => x.Direction == Direction && position == x.StackerCode && x.Area == area);
- if (point == null) { return null; }
+ string minRoadwayNo = minGroup.Key; // 鏁伴噺鏈�澶氱殑缁勭殑Key
- string station = point.PointCodeList[0];
+ return minRoadwayNo;
+ }
- var rList = point.PointCodeList;
- rList.Remove(station);
- rList.Add(station);
+ /// <summary>
+ /// 鑾峰彇宸烽亾鎴栫珯鍙�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<string> GetRoadWayAsync(int areaCode)
+ {
+ var minGroup = _locationRepository.QueryData(x => x.AreaId == areaCode && x.LocationStatus == (int)LocationEnum.Free)
+ .GroupBy(x => x.RoadwayNo)
+ .OrderBy(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
+ .First(); // 鍙栧嚭鏁伴噺鏈�灏戠殑缁�
- point.PointCodeList = rList;
- return station;
- }
- else { return null; }
+ string minRoadwayNo = minGroup.Key; // 鏁伴噺鏈�灏戠殑缁勭殑Key
+
+ return minRoadwayNo;
}
#endregion 浠诲姟璇锋眰鏂规硶
--
Gitblit v1.9.3