From 98cd144e4d58dbfcc09a2ffb0dbb6925519088b3 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 06 十一月 2024 14:12:56 +0800
Subject: [PATCH] 最新代码更改
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 793 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 520 insertions(+), 273 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 0ef476a..8149a7f 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,8 +1,11 @@
-锘縰sing WIDESEA_Common;
-using WIDESEA_DTO;
-using WIDESEA_IStorageTaskRepository;
-using WIDESEA_Repository;
-using WIDESEA_StorageTaskRepository;
+锘縰sing Mapster;
+using Masuit.Tools;
+using WIDESEA_DTO.MOM;
+using WIDESEA_DTO.WMS;
+using WIDESEA_IStorageBasicRepository;
+using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_StorageBasicRepository;
+using WIDESEA_StoragIntegrationServices;
namespace WIDESEA_StorageOutTaskServices;
@@ -12,6 +15,7 @@
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;
@@ -22,6 +26,11 @@
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; //闈欑疆\闄堝寲
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -36,7 +45,13 @@
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) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_outOrderRepository = outOrderRepository;
@@ -51,12 +66,20 @@
_pointStackerRelationRepository = pointStackerRelationRepository;
_taskExecuteDetailRepository = taskExecuteDetailRepository;
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
+ _boxingInfoRepository = boxingInfoRepository;
+ _cellStateService = cellStateService;
+ _processApplyService = processApplyService;
+ _areaInfoRepository = areaInfoRepository;
+ _agingInOrOutInputService = agingInOrOutInputService;
+ _stockInfoDetailRepository = stockInfoDetailRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
+ #region 鍑哄簱浠诲姟瀹屾垚
+
/// <summary>
- /// 鍫嗗灈鏈轰换鍔″畬鎴�
+ /// 鍑哄簱浠诲姟瀹屾垚
/// </summary>
/// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
/// <returns>杩斿洖缁撴灉闆�</returns>
@@ -65,35 +88,80 @@
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);
+ EquipmentParameterInfo info = JsonConvert.DeserializeObject<EquipmentParameterInfo>(process.ProcessValue);
+ AgingOutputDto agingOutputDto = new AgingOutputDto()
+ {
+ OpFlag = 1,
+ EquipmentCode = stock.LocationInfo.RoadwayNo,
+ TrayBarcode = stock.PalletCode,
+ SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto()
+ {
+ SlotNo = x.OrderNo.ToInt32(),
+ SerialNo = x.SerialNumber,
+ SerialNoResult = true,
+ ParameterInfo = new List<ParameterInfo>()
+ {
+ new ParameterInfo()
+ {
+ LowerLomit =info.LowerControlLimit,
+ UpperLimit = info.UpperControlLimit,
+ ParameterResult = info.EquipmentAvailabilityFlag,
+ ParameterCode = info.ParameterCode,
+ ParameterDesc = info.Description,
+ TargetValue = info.TargetValue,
+ Value = info.TargetValue,
+ DefectCode = info.UOMCode
+ }
+ }
+ }).ToList()
+ };
+ }
+ // 鏇存柊搴撳瓨鐘舵��
+ var loation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ var detail = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
+
+ // 璁剧疆搴撲綅鐘舵�佷负绌洪棽
+ loation.LocationStatus = LocationEnum.Free.ObjToInt();
+
// 鏇存柊浠诲姟鐘舵��
- task.TaskState = OutTaskStatusEnum.SC_OutFinish.ObjToInt();
+ task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
task.CurrentAddress = task.NextAddress;
task.NextAddress = task.TargetAddress;
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
// 浜嬪姟澶勭悊
+ // 寮�濮嬩簨鍔�
_unitOfWorkManage.BeginTran();
- var isStockUpdated = _stockInfoRepository.UpdateData(stock);
- var isTaskUpdated = await Update(task);
+ // 鍒犻櫎搴撳瓨淇℃伅
+ var isStockUpdated = _stockInfoRepository.DeleteDataById(stock.Id);
+ // 鍒犻櫎搴撳瓨淇℃伅
+ var isStockDetailUpdated = _stockInfoDetailRepository.DeleteDataByIds(detail.Select(x => (object)x.Id).ToArray());
+ // 鍒犻櫎浠诲姟淇℃伅
+ var isTaskUpdated = BaseDal.DeleteDataById(task.TaskId);
- if (isStockUpdated && isTaskUpdated)
+ // 濡傛灉搴撳瓨淇℃伅鍜屼换鍔′俊鎭兘鏇存柊鎴愬姛
+ if (isStockUpdated && isTaskUpdated && isStockDetailUpdated)
{
+ // 璁板綍鏃ュ織
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", $"浜嬪姟澶勭悊瀹屾垚锛屽簱瀛樼姸鎬佹洿鏂帮細{isStockUpdated}锛屼换鍔＄姸鎬佹洿鏂�:{isTaskUpdated}");
+ // 鎻愪氦浜嬪姟
_unitOfWorkManage.CommitTran();
+ // 杩斿洖鎴愬姛缁撴灉
return content.OK("浠诲姟瀹屾垚鎴愬姛");
}
else
{
+ // 璁板綍鏃ュ織
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", $"浜嬪姟澶勭悊澶辫触锛屽簱瀛樼姸鎬佹洿鏂帮細{isStockUpdated}锛屼换鍔＄姸鎬佹洿鏂�:{isTaskUpdated}");
+ // 鍥炴粴浜嬪姟
_unitOfWorkManage.RollbackTran();
+ // 杩斿洖澶辫触缁撴灉
return content.Error("浠诲姟鎴栧簱瀛樻洿鏂板け璐�");
}
}
@@ -105,46 +173,9 @@
}
}
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task, DtStockInfo stock)
- {
- WebResponseContent content = new WebResponseContent();
+ #endregion 鍫嗗灈鏈哄嚭搴撲换鍔″畬鎴�
- try
- {
- // 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樿揣浣嶄俊鎭�
- 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("浠诲姟瀹屾垚澶辫触");
- }
-
- return content;
- }
+ #region 绉诲簱浠诲姟瀹屾垚
/// <summary>
/// 绉诲簱浠诲姟瀹屾垚
@@ -159,7 +190,7 @@
// 鏇存柊璐т綅鍜屽簱瀛樹俊鎭�
(DtStockInfo updateStock, DtLocationInfo locationInf) = UpdateStockLocation(stock, task.NextAddress);
var taskHty = CreateHistoricalTask(task);
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInf}");
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInf}");
// 鎵ц鏁版嵁搴撲簨鍔�
bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInf, task.TaskId);
@@ -174,6 +205,100 @@
}
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
+ {
+ var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
+ var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
+
+ locationInf.LocationStatus = (int)LocationEnum.InStock;
+
+ // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
+ var taskHty = CreateHistoricalTask(task);
+
+ // 鍒涘缓搴撳瓨瀹炰緥妯″瀷
+ DtStockInfo stock;
+ if (boxing == null)
+ {
+ // 绌烘墭鐩�
+
+ stock = new DtStockInfo()
+ {
+ PalletCode = task.PalletCode,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFull = boxing.IsFull,
+ StockInfoDetails = new List<DtStockInfoDetail>()
+ {
+ new DtStockInfoDetail()
+ {
+ MaterielCode = "绌烘墭鐩�",
+ Id = 0,
+ }
+ }
+ };
+ }
+ else
+ {
+ // 瀹炵洏
+ var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
+ // 鍒涘缓搴撳瓨瀹炰緥妯″瀷
+ stock = new DtStockInfo()
+ {
+ PalletCode = task.PalletCode,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFull = boxing.IsFull,
+ 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
+ };
+ var result = await _agingInOrOutInputService.GetOCVInputAsync(agingInputDto);
+ stock.Remark = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString()).LinedProcessFeedbackTime;
+
+
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
+
+ }
+
+ // 鎵ц鏁版嵁搴撲簨鍔�
+ bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
+ if (isResult)
+ content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ else
+ content.Error("鍏ュ簱浠诲姟瀹屾垚澶辫触");
+ }
+ catch (Exception err)
+ {
+ Console.WriteLine(err.Message.ToString());
+ }
+ return content;
+ }
+
+ #endregion 鍏ュ簱浠诲姟瀹屾垚
+
+ #region 浠诲姟瀹屾垚
/// <summary>
/// 浠诲姟瀹屾垚
@@ -198,22 +323,42 @@
var stock = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == task.PalletCode);
if (stock == null)
{
- return content.Error("搴撳瓨涓嶅瓨鍦�");
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "搴撳瓨涓嶅瓨鍦ㄥ瓨鍦紝鍒ゆ柇鏄惁鏄叆搴撲换鍔�", $"{task.TaskType}");
+ if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
+ return await CompleteInboundTaskAsync(task);
+ }
+ else if (task.TaskType == (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)
+ if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
- if (task.TaskState == OutTaskStatusEnum.SC_OutExecuting.ObjToInt())
+ if (task.TaskState == TaskOutStatusEnum.Line_OutFinish.ObjToInt())
{
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", "");
return await CompleteStackTaskAsync(task, stock);
}
+ else if (task.TaskState == TaskOutStatusEnum.SC_OutExecuting.ObjToInt())
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "搴撳瓨涓嶅瓨鍦ㄤ篃涓嶆槸鍏ュ簱浠诲姟", "");
+ return content.Error("搴撳瓨涓嶅瓨鍦�");
+ }
else
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�", "");
- return await CompleteTaskAsync(task, stock);
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟鐘舵�佸紓甯�", "");
+ return content.Error("浠诲姟鐘舵�佸紓甯�");
}
}
else if (task.TaskType == (int)TaskTypeEnum.RelocationIn)
@@ -228,6 +373,10 @@
}
}
+ #endregion 浠诲姟瀹屾垚
+
+ #region 璇锋眰浠诲姟
+
/// <summary>
/// 璇锋眰浠诲姟
/// </summary>
@@ -235,40 +384,244 @@
/// <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);
+ // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+ TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ {
+ TrayBarcode = input.PalletCode
+ };
- // 鑾峰彇浠撳簱鍖哄煙淇℃伅
- var areaInfo = await _wareAreaInfoRepository.QueryFirstAsync(x => x.WareAreaCode == input.AreaCode);
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ if (!content.Status) return content;
- // 鏌ヨ鏄惁宸叉湁浠诲姟
+ // 娣诲姞缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.ToString());
+ var boxing = await CreateBoxingInfo(result, input.PalletCode);
+
+ // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
+ ProcessApplyDto process = await GetProcessApplyAsync(result);
+
+ // 濡傛灉process涓簄ull锛屽垯杩斿洖content
+ if (process == null) return content;
+
+ // 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
+ var processResponse = await GetProcessResponseAsync(process, input.Position);
+
+ // 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
-
- if (task != null)
+ // 濡傛灉task涓嶄负null锛屽垯璋冪敤UpdateExistingTask鏂规硶锛屾洿鏂颁换鍔★紱鍚﹀垯璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
+ content = task != null ? await UpdateExistingTask(input, task) : await CreateNewTask(processResponse, input);
+ if (content.Status)
{
-
- // 鏇存柊鐜版湁浠诲姟
- content = await UpdateExistingTask(input, areaInfo.AreaID, task);
- }
- else
- {
- // 鍒涘缓鏂颁换鍔�
- content = await CreateNewTask(input, areaInfo.AreaID);
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
}
}
catch (Exception err)
{
- // 閿欒澶勭悊
+ // 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
content.Error(err.Message);
Console.WriteLine(err.Message);
}
+ // 杩斿洖content
return content;
}
+
+ // 鑾峰彇鎵樼洏鍗曞厓鏍肩姸鎬�
+ private async Task<WebResponseContent> GetTrayCellStatusAsync(TrayCellsStatusDto trayCells)
+ {
+ // 璋冪敤_cellStateService.GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨墭鐩樺崟鍏冩牸鐘舵��
+ return await _cellStateService.GetTrayCellStatusAsync(trayCells);
+ }
+
+ // 鑾峰彇缁勭洏淇℃伅
+ private async Task<DtBoxingInfo> CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
+ {
+ return new DtBoxingInfo
+ {
+ PalletCode = palletCode,
+ IsFull = true,
+ 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()
+ };
+ }
+
+ // 鑾峰彇宸ヨ壓鍝嶅簲
+ private async Task<List<Dt_EquipmentProcess>> GetProcessResponseAsync(ProcessApplyDto process, string position)
+ {
+ // 濡傛灉process涓簄ull锛屽垯杩斿洖null
+ if (process == null) return null;
+
+ // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+ WebResponseContent content = await _processApplyService.GetProcessApplyAsync(process);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+ if (!content.Status) return null;
+
+ // 灏哻ontent.Data杞崲涓篟esultProcessApply瀵硅薄
+ var apply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
+ // 鏍规嵁position鐨勫�硷紝杩斿洖涓嶅悓鐨凞t_EquipmentProcess鍒楄〃
+ switch (position)
+ {
+ case "1088":
+ return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
+ .Where(x => x.EquipmentType == "闄堝寲" && x.WipOrderNo == apply.WipOrderNo && x.ProductDesc == apply.ProductNo)
+ .ToList();
+
+ case "1339":
+ case "1406":
+ return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
+ .Where(x => x.EquipmentType == "闈欑疆" && x.WipOrderNo == apply.WipOrderNo && x.ProductDesc == apply.ProductNo)
+ .ToList();
+
+ default:
+ return new List<Dt_EquipmentProcess>();
+ }
+ }
+
+ #endregion 璇锋眰浠诲姟
+
+ #region 璇锋眰绌烘墭鐩�
+
+ public async Task<WebResponseContent> RequestTrayTaskAsync(string position)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "CH");
+
+ var stockInfo = _stockInfoRepository.QueryData(x => x.LocationInfo.AreaId == area.AreaID && x.StockInfoDetails.Any(z => z.MaterielCode == "绌烘墭鐩�")).OrderBy(x => x.CreateDate).FirstOrDefault();
+ // 鍒涘缓鏂颁换鍔″疄渚�
+ var task = new Dt_Task
+ {
+ CurrentAddress = stockInfo.LocationCode,
+ Grade = 1,
+ Roadway = stockInfo.LocationInfo.RoadwayNo,
+ TargetAddress = position,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = position,
+ OrderNo = null,
+ PalletCode = stockInfo.PalletCode,
+ SourceAddress = stockInfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.OutTray,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+
+ var taskId = await BaseDal.AddDataAsync(task);
+ bool isResult = taskId > 0;
+ if (isResult)
+ {
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = DateTime.Now.ToString("MMddHHmmss"),
+ RoadWay = task.Roadway,
+ SourceAddress = stockInfo.LocationCode,
+ TargetAddress = task.Roadway,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ Id = 0,
+ TaskType = (int)TaskOutboundTypeEnum.OutTray
+ };
+ content.OK(data: taskDTO);
+ }
+ }
+ catch (Exception ex)
+ {
+ throw;
+ }
+ return content;
+ }
+
+ #endregion 璇锋眰绌烘墭鐩�
+
+ #region 闄堝寲璇锋眰鍑哄簱
+
+ // 闄堝寲璇锋眰鍑哄簱
+ public async Task<WebResponseContent> OutTrayByCh(string position)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaName == "闄堝寲鍖�");
+ // 鏌ヨ搴撳瓨淇℃伅
+
+ var stockInfo = _stockInfoRepository.QueryData(x => x.AreaCode == area.AreaCode && Convert.ToDateTime(x.Remark) < DateTime.Now && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).OrderBy(x => x.CreateDate).FirstOrDefault();
+ // 鍒涘缓鏂颁换鍔″疄渚�
+ var task = 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,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.OutTray,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+ var taskId = await BaseDal.AddDataAsync(task);
+ bool isResult = taskId > 0;
+ if (isResult)
+ {
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = DateTime.Now.ToString("MMddHHmmss"),
+ RoadWay = task.Roadway,
+ SourceAddress = stockInfo.LocationCode,
+ TargetAddress = task.Roadway,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ Id = 0,
+ TaskType = (int)TaskOutboundTypeEnum.OutTray
+ };
+ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ _locationRepository.UpdateData(stockInfo.LocationInfo);
+ content.OK(data: taskDTO);
+ }
+ }
+ catch (Exception ex)
+ {
+ throw;
+ }
+ return content;
+ }
+
+ #endregion 闄堝寲璇锋眰鍑哄簱
#endregion 澶栭儴鎺ュ彛鏂规硶
@@ -426,12 +779,16 @@
/// <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;
}
@@ -440,141 +797,22 @@
/// </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;
- }
-
+ /// <param name="task"></param>
+ /// <returns></returns>
private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
{
// 鏇存柊浠诲姟鐘舵��
- task.TaskState = OutTaskStatusEnum.OutFinish.ObjToInt();
+ task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
task.CurrentAddress = task.NextAddress;
// 鍒涘缓鍘嗗彶浠诲姟
@@ -583,7 +821,7 @@
taskHty.TaskId = 0;
taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.SourceId = task.TaskId;
- taskHty.TaskState = OutTaskStatusEnum.OutFinish.ObjToInt();
+ taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
return taskHty;
}
@@ -592,14 +830,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);
}
@@ -615,8 +859,17 @@
_unitOfWorkManage.BeginTran();
try
{
- // 鏇存柊搴撳瓨
- var isUpdateStock = await _stockInfoRepository.UpdateDataAsync(stock);
+ var isUpdateStock = true;
+ if (taskHty.TaskType == (int)TaskTypeEnum.Outbound)
+ {
+ // 鏇存柊搴撳瓨
+ isUpdateStock = await _stockInfoRepository.UpdateDataAsync(stock);
+ }
+ else
+ {
+ // 娣诲姞搴撳瓨
+ isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
+ }
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
@@ -630,13 +883,13 @@
// 鎻愪氦鎴栧洖婊氫簨鍔�
if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
{
- 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;
}
@@ -659,69 +912,66 @@
/// <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瀵硅薄
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)
- {
- // 澶勭悊鍑哄簱浠诲姟
- 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 = await GetLocationDistributeAsync(task.Roadway);
+ toAddress = location.LocationCode;
+ taskState = (int)TaskInStatusEnum.Line_InFinish;
+ beforeStatus = location.LocationStatus;
- // 鏇存柊璐т綅淇℃伅
- location.LocationStatus = (int)LocationEnum.Lock;
- }
+ // 鏇存柊璐т綅淇℃伅
+ location.LocationStatus = (int)LocationEnum.Lock;
// 鏇存柊浠诲姟淇℃伅
- task.SourceAddress = input.Position;
task.CurrentAddress = input.Position;
task.TargetAddress = toAddress;
task.NextAddress = toAddress;
task.TaskState = taskState;
+ // 寮�濮嬩簨鍔�
_unitOfWorkManage.BeginTran();
+ // 瀹氫箟鍙橀噺
bool isUpdateLo = true;
bool isUpdateChange = true;
// 灏濊瘯鏇存柊浠诲姟
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)
+ bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
+
+ // 鍒涘缓LocationChangeRecordDto瀵硅薄
+ LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
{
- 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);
- }
+ // 璁剧疆鍙橀噺
+ 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);
if (isResult && isUpdateLo && isTaskDetail)
{
+ // 鎻愪氦浜嬪姟
_unitOfWorkManage.CommitTran();
content.OK(data: task);
}
else
{
+ // 鍥炴粴浜嬪姟
_unitOfWorkManage.RollbackTran();
content.Error("鏇存柊浠诲姟澶辫触");
}
@@ -735,11 +985,12 @@
/// <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(List<Dt_EquipmentProcess> process, RequestTaskDto input)
{
WebResponseContent content = new WebResponseContent();
+ List<string> strings = process.Select(x => x.EquipmentName).ToList();
// 鑾峰彇鐩爣鍦板潃
- string ToAddress = await GetRoadWayAsync(areaId, input.Position, input.Direction, input.Area, input.Type);
+ string ToAddress = await GetRoadWayAsync(strings);
// 鍒涘缓鏂颁换鍔″疄渚�
var task = new Dt_Task
@@ -754,20 +1005,36 @@
OrderNo = null,
PalletCode = input.PalletCode,
SourceAddress = input.Position,
- TaskState = (int)InTaskStatusEnum.InNew,
+ TaskState = (int)TaskInStatusEnum.InNew,
TaskType = (int)TaskTypeEnum.Inbound,
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 = 0,
+ Grade = 1,
+ PalletCode = DateTime.Now.ToString("MMddHHmmss"),
+ RoadWay = task.Roadway,
+ SourceAddress = input.Position,
+ TargetAddress = task.Roadway,
+ TaskState = (int)TaskInStatusEnum.InNew,
+ Id = 0,
+ TaskType = (int)TaskInboundTypeEnum.Inbound,
+ };
+ content.OK(data: taskDTO);
+ }
else
content.Error("娣诲姞浠诲姟澶辫触");
}
@@ -782,13 +1049,13 @@
/// <param name="areaId">鍖哄煙涓婚敭</param>
/// <param name="roadWay">宸烽亾</param>
/// <returns></returns>
- public async Task<DtLocationInfo> GetLocationDistributeAsync(int areaId, string roadWay)
+ public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay)
{
#region 鑾峰彇璐т綅
try
{
- var locations = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ var locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
if (locations == null)
{
return null;
@@ -813,36 +1080,16 @@
/// <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(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)
+ .OrderBy(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];
-
- var rList = point.PointCodeList;
- rList.Remove(station);
- rList.Add(station);
-
- point.PointCodeList = rList;
- return station;
- }
- else { return null; }
+ return minRoadwayNo;
}
#endregion 浠诲姟璇锋眰鏂规硶
--
Gitblit v1.9.3