From 319e8729b47c96e3a3717c5a40cd5df867d65ce5 Mon Sep 17 00:00:00 2001 From: wanshenmean <cathay_xy@163.com> Date: 星期五, 13 九月 2024 17:25:20 +0800 Subject: [PATCH] 最新代码提交 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 234 +++++++++++++++------------------------------------------- 1 files changed, 61 insertions(+), 173 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..dd1a96c 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,4 +1,5 @@ -锘縩amespace WIDESEA_StorageOutTaskServices; +锘縰sing Mapster; +namespace WIDESEA_StorageOutTaskServices; public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService { @@ -16,6 +17,7 @@ private readonly IPointStackerRelationRepository _pointStackerRelationRepository; private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository; private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository; + private readonly IBoxingInfoRepository _boxingInfoRepository; public Dt_TaskService(IDt_TaskRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, @@ -30,7 +32,8 @@ IDt_WareAreaInfoRepository wareAreaInfoRepository, IPointStackerRelationRepository pointStackerRelationRepository, ITaskExecuteDetailRepository taskExecuteDetailRepository, - ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal) + ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository, + IBoxingInfoRepository boxingInfoRepository) : base(BaseDal) { _unitOfWorkManage = unitOfWorkManage; _outOrderRepository = outOrderRepository; @@ -45,9 +48,12 @@ _pointStackerRelationRepository = pointStackerRelationRepository; _taskExecuteDetailRepository = taskExecuteDetailRepository; _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository; + _boxingInfoRepository = boxingInfoRepository; } #region 澶栭儴鎺ュ彛鏂规硶 + + #region 鍫嗗灈鏈哄嚭搴撲换鍔″畬鎴� /// <summary> /// 鍫嗗灈鏈哄嚭搴撲换鍔″畬鎴� @@ -111,46 +117,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> /// 绉诲簱浠诲姟瀹屾垚 @@ -181,6 +150,10 @@ return content; } + #endregion 绉诲簱浠诲姟瀹屾垚 + + #region 鍏ュ簱浠诲姟瀹屾垚 + /// <summary> /// 鍏ュ簱浠诲姟瀹屾垚 /// </summary> @@ -191,10 +164,19 @@ WebResponseContent content = new WebResponseContent(); try { + var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode); + + var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>(); // 鍒涘缓搴撳瓨瀹炰緥妯″瀷 DtStockInfo stock = new DtStockInfo() { - + PalletCode = task.PalletCode, + LocationCode = task.TargetAddress, + CreateDate = DateTime.Now, + Creater = "system", + IsFull = boxing.IsFull, + StockInfoDetails = boxDetail, + LocationInfo = new DtLocationInfo() }; // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷 @@ -219,6 +201,10 @@ } return content; } + + #endregion 鍏ュ簱浠诲姟瀹屾垚 + + #region 浠诲姟瀹屾垚 /// <summary> /// 浠诲姟瀹屾垚 @@ -267,8 +253,8 @@ } else { - LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎬讳换鍔″嚭搴撳畬鎴�", ""); - return await CompleteTaskAsync(task, stock); + LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "搴撳瓨涓嶅瓨鍦ㄤ篃涓嶆槸鍏ュ簱浠诲姟", ""); + return content.Error("搴撳瓨涓嶅瓨鍦�"); } } else if (task.TaskType == (int)TaskTypeEnum.RelocationIn) @@ -282,6 +268,10 @@ return content.Error("浠诲姟鐘舵�佸紓甯�"); } } + + #endregion 浠诲姟瀹屾垚 + + #region 璇锋眰浠诲姟 /// <summary> /// 璇锋眰浠诲姟 @@ -323,6 +313,8 @@ return content; } + + #endregion 璇锋眰浠诲姟 #endregion 澶栭儴鎺ュ彛鏂规硶 @@ -480,12 +472,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; } @@ -494,135 +490,11 @@ /// </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> @@ -651,14 +523,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); } @@ -683,7 +561,7 @@ else { // 娣诲姞搴撳瓨 - isUpdateStock = await _stockInfoRepository.AddDataAsync(stock) > 0; + isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock); } // 娣诲姞鍘嗗彶浠诲姟 @@ -698,13 +576,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; } @@ -729,13 +607,16 @@ /// <returns></returns> private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, int areaId, 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) { // 澶勭悊鍑哄簱浠诲姟 @@ -761,7 +642,9 @@ task.NextAddress = toAddress; task.TaskState = taskState; + // 寮�濮嬩簨鍔� _unitOfWorkManage.BeginTran(); + // 瀹氫箟鍙橀噺 bool isUpdateLo = true; bool isUpdateChange = true; @@ -770,8 +653,10 @@ 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瀵硅薄 LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto() { + // 璁剧疆鍙橀噺 AfterStatus = location.LocationStatus, BeforeStatus = beforeStatus, TaskNum = task.TaskNum.Value, @@ -779,17 +664,20 @@ 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("鏇存柊浠诲姟澶辫触"); } -- Gitblit v1.9.3