From ad6f399066a747aeaba987360bce9ee40227302c Mon Sep 17 00:00:00 2001 From: 肖洋 <cathay_xy@163.com> Date: 星期一, 09 十二月 2024 18:23:00 +0800 Subject: [PATCH] SignalR+事件总线推送前端 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs index 058f3e0..37693a9 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs @@ -599,7 +599,7 @@ PalletCode = input.PalletCode, SourceAddress = stationManager.stationLocation, TaskState = (int)TaskInStatusEnum.Line_InFinish, - TaskType = (int)TaskOutboundTypeEnum.OutNG, + TaskType = (int)TaskOutboundTypeEnum.InToOut, TaskNum = await BaseDal.GetTaskNo(), Creater = "Systeam" }; @@ -712,7 +712,7 @@ PalletCode = input.PalletCode, SourceAddress = stationManager.stationLocation, TaskState = (int)TaskInStatusEnum.Line_InFinish, - TaskType = (int)TaskOutboundTypeEnum.OutNG, + TaskType = (int)TaskOutboundTypeEnum.InToOut, TaskNum = await BaseDal.GetTaskNo(), Creater = "Systeam" }; @@ -763,8 +763,9 @@ TaskNum = await BaseDal.GetTaskNo(), Creater = "Systeam" }; - + ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + locationInfo.LocationStatus.ToString()); locationInfo.LocationStatus = (int)LocationEnum.FreeDisable; + ConsoleHelper.WriteSuccessLine($"淇敼鍚庯細" + locationInfo.LocationStatus.ToString()); await UpdateLocationAsync(locationInfo); return task; @@ -789,7 +790,7 @@ } else { - locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.FreeDisable && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1); + locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Distribute && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1); } if (locations == null) @@ -994,24 +995,28 @@ var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1", new List<string>()); - - var task = CreateTask(stockInfo, taskDTO.Position, (int)TaskOutboundTypeEnum.OutTray); - - // 鍒涘缓浠诲姟DTO - WMSTaskDTO wmsTask = CreateTaskDTO(task); - - // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢� - stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable; - location.LocationStatus = (int)LocationEnum.FreeDisable; - await _unitOfWorkManage.UseTranAsync(async () => + if (stockInfo != null) { - await BaseDal.AddDataAsync(task); - await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo); - await _locationRepository.UpdateDataAsync(location); - }); + var task = CreateTask(stockInfo, taskDTO.Position, (int)TaskOutboundTypeEnum.OutTray); - // 杩斿洖鎴愬姛鍝嶅簲 - return content.OK(data: wmsTask); + // 鍒涘缓浠诲姟DTO + WMSTaskDTO wmsTask = CreateTaskDTO(task); + + // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢� + stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable; + location.LocationStatus = (int)LocationEnum.Distribute; + await _unitOfWorkManage.UseTranAsync(async () => + { + await BaseDal.AddDataAsync(task); + await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo); + await _locationRepository.UpdateDataAsync(location); + }); + + // 杩斿洖鎴愬姛鍝嶅簲 + return content.OK(data: wmsTask); + } + else + content.Error("甯告俯绌烘墭鐩樻暟閲忎笉瓒�"); } } catch (Exception ex) -- Gitblit v1.9.3