From 85fac67b3bcd53894151a2bce384a945b1b67eb2 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 30 三月 2026 14:26:02 +0800
Subject: [PATCH] feat(TaskService): OutboundFinishTaskTrayAsync添加任务和库存历史保存
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 621 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 506 insertions(+), 115 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 7f03664..085d132 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,4 +1,5 @@
-锘縰sing AutoMapper;
+using Mapster;
+using MapsterMapper;
using Microsoft.Extensions.Configuration;
using SqlSugar;
using System.Text.Json;
@@ -8,7 +9,11 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO;
+using WIDESEA_Core.Core;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO.GradingMachine;
+using WIDESEA_DTO.MES;
+using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
using WIDESEA_IStockService;
@@ -24,6 +29,10 @@
private readonly ILocationInfoService _locationInfoService;
private readonly HttpClientHelper _httpClientHelper;
private readonly IConfiguration _configuration;
+ private readonly RoundRobinService _roundRobinService;
+ private readonly IMesService _mesService;
+ private readonly ITask_HtyService _task_HtyService;
+ private readonly IStockInfo_HtyService _stockInfo_HtyService;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -42,13 +51,21 @@
IStockInfoService stockInfoService,
ILocationInfoService locationInfoService,
HttpClientHelper httpClientHelper,
- IConfiguration configuration) : base(BaseDal)
+ IConfiguration configuration,
+ RoundRobinService roundRobinService,
+ IMesService mesService,
+ ITask_HtyService task_HtyService,
+ IStockInfo_HtyService stockInfo_HtyService) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
_locationInfoService = locationInfoService;
_httpClientHelper = httpClientHelper;
_configuration = configuration;
+ _roundRobinService = roundRobinService;
+ _mesService = mesService;
+ _task_HtyService = task_HtyService;
+ _stockInfo_HtyService = stockInfo_HtyService;
}
#region WCS閫昏緫澶勭悊
@@ -60,7 +77,7 @@
{
try
{
- WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+ WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
if (content.Status)
{
return content;
@@ -165,18 +182,23 @@
var locationInfo = await _locationInfoService.GetLocationInfo(task.Roadway);
if (locationInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
- locationInfo.LocationStatus = LocationStatusEnum.FreeLock.GetHashCode();
- task.CurrentAddress = task.SourceAddress;
- task.NextAddress = locationInfo.LocationCode;
- task.TargetAddress = locationInfo.LocationCode;
- task.TaskStatus = TaskInStatusEnum.Line_InFinish.GetHashCode();
+ return await ExecuteWithinTransactionAsync(async () =>
+ {
+ locationInfo.LocationStatus = LocationStatusEnum.FreeLock.GetHashCode();
+ task.CurrentAddress = task.SourceAddress;
+ task.NextAddress = locationInfo.LocationCode;
+ task.TargetAddress = locationInfo.LocationCode;
+ task.TaskStatus = TaskInStatusEnum.Line_InFinish.GetHashCode();
- var updateResult = await BaseDal.UpdateDataAsync(task);
- var locationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+ var updateTaskResult = await BaseDal.UpdateDataAsync(task);
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+ if (!updateTaskResult || !updateLocationResult)
+ {
+ return WebResponseContent.Instance.Error("浠诲姟鏇存柊澶辫触");
+ }
- return WebResponseContent.Instance.OK(
- updateResult && locationResult ? "浠诲姟鏇存柊鎴愬姛" : "浠诲姟鏇存柊澶辫触",
- locationInfo.LocationCode);
+ return WebResponseContent.Instance.OK("浠诲姟鏇存柊鎴愬姛", locationInfo.LocationCode);
+ });
}
catch (Exception ex)
{
@@ -198,29 +220,42 @@
if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
- stockInfo.LocationCode = location.LocationCode;
- stockInfo.LocationId = location.Id;
- stockInfo.OutboundDate = task.Roadway switch
+ if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+ return await ExecuteWithinTransactionAsync(async () =>
{
- var r when r.Contains("GW") => DateTime.Now.AddHours(2),
- var r when r.Contains("CW") => DateTime.Now.AddHours(1),
- _ => DateTime.Now
- };
+ WebResponseContent content = new WebResponseContent();
+ stockInfo.LocationCode = location.LocationCode;
+ stockInfo.LocationId = location.Id;
+ stockInfo.OutboundDate = task.Roadway switch
+ {
+ var r when r.Contains("GW") => DateTime.Now.AddHours(2),
+ var r when r.Contains("CW") => DateTime.Now.AddHours(1),
+ _ => DateTime.Now
+ };
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
- location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
+ location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
- var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
- var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
- if (!updateLocationResult || !updateStockResult)
- return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
-
- var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
- if (!deleteTaskResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
-
- var historyTask = _mapper.Map<Dt_Task_Hty>(task);
- historyTask.InsertTime = DateTime.Now;
-
- return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+ var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+ if (!updateLocationResult || !updateStockResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+ // 璋冪敤MES鎵樼洏杩涚珯
+ var inboundRequest = new InboundInContainerRequest
+ {
+ EquipmentCode = "STK-GROUP-001",
+ ResourceCode = "STK-GROUP-001",
+ LocalTime = DateTime.Now,
+ ContainerCode = taskDto.PalletCode
+ };
+ var inboundResult = _mesService.InboundInContainer(inboundRequest);
+ if (inboundResult == null || inboundResult.Data == null || !inboundResult.Data.IsSuccess)
+ {
+ return content.Error($"浠诲姟瀹屾垚澶辫触锛歁ES杩涚珯澶辫触: {inboundResult?.Data?.Msg ?? inboundResult?.ErrorMessage ?? "鏈煡閿欒"}");
+ }
+ return await CompleteTaskAsync(task, "鍏ュ簱瀹屾垚");
+ });
}
catch (Exception ex)
{
@@ -241,24 +276,86 @@
var location = await _locationInfoService.GetLocationInfo(task.Roadway, task.SourceAddress);
if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
- var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode); stockInfo.LocationCode = location.LocationCode;
- stockInfo.LocationId = location.Id;
- stockInfo.OutboundDate = DateTime.Now;
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
+ if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
- location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+ WebResponseContent content = new WebResponseContent();
+ return await ExecuteWithinTransactionAsync(async () =>
+ {
+ stockInfo.LocationId = 0;
+ stockInfo.LocationCode = null;
+ stockInfo.OutboundDate = DateTime.Now;
- var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
- var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
- if (!updateLocationResult || !updateStockResult)
- return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+ location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
- var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
- if (!deleteTaskResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+ var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+ if (!updateLocationResult || !updateStockResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
- var historyTask = _mapper.Map<Dt_Task_Hty>(task);
- historyTask.InsertTime = DateTime.Now;
+ // 璋冪敤MES鎵樼洏鍑虹珯
+ var outboundRequest = new OutboundInContainerRequest
+ {
+ EquipmentCode = "STK-GROUP-001",
+ ResourceCode = "STK-GROUP-001",
+ LocalTime = DateTime.Now,
+ ContainerCode = taskDto.PalletCode,
+ ParamList = new List<ParamItem>()
+ };
+ var outboundResult = _mesService.OutboundInContainer(outboundRequest);
+ if (outboundResult == null || outboundResult.Data == null || !outboundResult.Data.IsSuccess)
+ {
+ return content.Error($"浠诲姟瀹屾垚澶辫触锛歁ES鍑虹珯澶辫触: {outboundResult?.Data?.Msg ?? outboundResult?.ErrorMessage ?? "鏈煡閿欒"}");
+ }
- return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ return await CompleteTaskAsync(task, "鍑哄簱瀹屾垚");
+ });
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 绉诲簱浠诲姟瀹屾垚锛氫慨鏀瑰簱瀛樹綅缃笌鐘舵�侊紝淇敼婧�/鐩爣璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁
+ /// </summary>
+ public async Task<WebResponseContent> RelocationFinishTaskAsync(CreateTaskDto taskDto)
+ {
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(s =>
+ s.PalletCode == taskDto.PalletCode &&
+ s.TaskType == TaskRelocationTypeEnum.Relocation.GetHashCode());
+ if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑绉诲簱浠诲姟");
+
+ var sourceLocation = await _locationInfoService.GetLocationInfo(task.Roadway, task.SourceAddress);
+ if (sourceLocation == null) return WebResponseContent.Instance.Error("鏈壘鍒扮Щ搴撴簮璐т綅");
+
+ var targetLocation = await _locationInfoService.GetLocationInfo(task.Roadway, task.TargetAddress);
+ if (targetLocation == null) return WebResponseContent.Instance.Error("鏈壘鍒扮Щ搴撶洰鏍囪揣浣�");
+
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
+ if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+ return await ExecuteWithinTransactionAsync(async () =>
+ {
+ stockInfo.LocationCode = targetLocation.LocationCode;
+ stockInfo.LocationId = targetLocation.Id;
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
+
+ sourceLocation.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+ targetLocation.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
+
+ var updateSourceResult = await _locationInfoService.UpdateLocationInfoAsync(sourceLocation);
+ var updateTargetResult = await _locationInfoService.UpdateLocationInfoAsync(targetLocation);
+ var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+
+ if (!updateSourceResult || !updateTargetResult || !updateStockResult)
+ return WebResponseContent.Instance.Error("绉诲簱浠诲姟瀹屾垚澶辫触");
+
+ return await CompleteTaskAsync(task, "绉诲簱瀹屾垚");
+ });
}
catch (Exception ex)
{
@@ -275,7 +372,7 @@
{
try
{
- WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+ WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
if (content.Status)
{
return content;
@@ -294,6 +391,61 @@
}
/// <summary>
+ /// 绌烘墭鐩樺叆搴撳畬鎴�
+ /// </summary>
+ public async Task<WebResponseContent> InboundFinishTaskTrayAsync(CreateTaskDto taskDto)
+ {
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
+ if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+
+ var location = await _locationInfoService.GetLocationInfo(task.Roadway, task.TargetAddress);
+ if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
+
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
+ if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+ return await ExecuteWithinTransactionAsync(async () =>
+ {
+ stockInfo.LocationCode = location.LocationCode;
+ stockInfo.LocationId = location.Id;
+ stockInfo.StockStatus = StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode();
+
+ location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
+
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+ var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+ if (!updateLocationResult || !updateStockResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ // 淇濆瓨浠诲姟鍘嗗彶
+ var historyTask = _mapper.Map<Dt_Task_Hty>(task);
+ historyTask.InsertTime = DateTime.Now;
+ historyTask.OperateType = "绌烘墭鐩樺叆搴撳畬鎴�";
+ if (await _task_HtyService.Repository.AddDataAsync(historyTask) <= 0)
+ return WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
+
+ // 淇濆瓨搴撳瓨鍘嗗彶
+ var historyStock = _mapper.Map<Dt_StockInfo_Hty>(stockInfo);
+ historyStock.InsertTime = DateTime.Now;
+ historyStock.OperateType = "绌烘墭鐩樺叆搴撳畬鎴�";
+ if (await _stockInfo_HtyService.Repository.AddDataAsync(historyStock) <= 0)
+ return WebResponseContent.Instance.Error("搴撳瓨鍘嗗彶淇濆瓨澶辫触");
+
+ var deleteResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ });
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
/// 鍒涘缓绌烘墭鐩樺嚭搴撲换鍔�
/// </summary>
/// <param name="taskDto"></param>
@@ -303,7 +455,7 @@
try
{
- var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => x.LocationDetails.WarehouseId == taskDto.WarehouseId && x.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode() && x.StockStatus == StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode());
+ var stockInfo = await _stockInfoService.Repository.QueryDataNavFirstAsync(x => x.LocationDetails.WarehouseId == taskDto.WarehouseId && x.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode() && x.StockStatus == StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode());
if (stockInfo == null)
return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
@@ -317,18 +469,77 @@
NextAddress = taskDto.TargetAddress,
TargetAddress = taskDto.TargetAddress,
Roadway = stockInfo.LocationDetails.RoadwayNo,
- TaskType = TaskTypeEnum.OutEmpty.GetHashCode(),
+ TaskType = TaskOutboundTypeEnum.OutEmpty.GetHashCode(),
TaskStatus = TaskStatusEnum.New.GetHashCode(),
Grade = 1,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "system",
};
- var taskDtos = _mapper.Map<List<WMSTaskDTO>>(task);
- return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+ var taskDtos = task.Adapt<WMSTaskDTO>();
+
+ var addResult = await BaseDal.AddDataAsync(task) > 0;
+ if (!addResult)
+ return WebResponseContent.Instance.Error("浠诲姟鍒涘缓澶辫触");
+ return WebResponseContent.Instance.OK("浠诲姟鍒涘缓鎴愬姛", taskDtos);
}
catch (Exception ex)
{
return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 绌烘墭鐩樺嚭搴撳畬鎴�
+ /// </summary>
+ public async Task<WebResponseContent> OutboundFinishTaskTrayAsync(CreateTaskDto taskDto)
+ {
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
+ if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+
+ var location = await _locationInfoService.GetLocationInfo(task.Roadway, task.SourceAddress);
+ if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
+
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
+ if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+ return await ExecuteWithinTransactionAsync(async () =>
+ {
+ stockInfo.LocationId = 0;
+ stockInfo.LocationCode = null;
+ stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.GetHashCode();
+
+ location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+ var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+ if (!updateLocationResult || !updateStockResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ // 淇濆瓨浠诲姟鍘嗗彶
+ var historyTask = _mapper.Map<Dt_Task_Hty>(task);
+ historyTask.InsertTime = DateTime.Now;
+ historyTask.OperateType = "绌烘墭鐩樺嚭搴撳畬鎴�";
+ if (await _task_HtyService.Repository.AddDataAsync(historyTask) <= 0)
+ return WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
+
+ // 淇濆瓨搴撳瓨鍘嗗彶
+ var historyStock = _mapper.Map<Dt_StockInfo_Hty>(stockInfo);
+ historyStock.InsertTime = DateTime.Now;
+ historyStock.OperateType = "绌烘墭鐩樺嚭搴撳畬鎴�";
+ if (await _stockInfo_HtyService.Repository.AddDataAsync(historyStock) <= 0)
+ return WebResponseContent.Instance.Error("搴撳瓨鍘嗗彶淇濆瓨澶辫触");
+
+ var deleteResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ });
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
}
}
@@ -363,15 +574,15 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- private async Task<WebResponseContent> GetTasksByPalletCodeAsync(string palletCode)
+ private async Task<WebResponseContent> GetTaskByPalletCodeAsync(string palletCode)
{
try
{
- var tasks = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
- if (tasks == null)
+ var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
+ if (task == null)
return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
- var taskDtos = _mapper.Map<List<WMSTaskDTO>>(tasks);
- return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+ var taskDto = _mapper.Map<WMSTaskDTO>(task);
+ return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDto);
}
catch (Exception ex)
{
@@ -380,20 +591,54 @@
}
/// <summary>
- /// 鏍规嵁宸烽亾纭畾鐩爣鍦板潃
+ /// 瀹屾垚浠诲姟鍚庣粺涓�澶勭悊锛堝垹闄や换鍔℃暟鎹級
/// </summary>
- private string DetermineTargetAddress(string roadway, Dictionary<string, string> addressMap)
+ private async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task, string operateType = "")
+ {
+ var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteTaskResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ var historyTask = _mapper.Map<Dt_Task_Hty>(task);
+ historyTask.InsertTime = DateTime.Now;
+ historyTask.OperateType = operateType;
+ var saveResult = await _task_HtyService.Repository.AddDataAsync(historyTask) > 0;
+ if (!saveResult) return WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
+
+ return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ }
+
+ /// <summary>
+ /// 鏍规嵁宸烽亾纭畾鐩爣鍦板潃锛堟敮鎸佸鍑哄簱鍙ｈ疆璇級
+ /// </summary>
+ private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
{
if (string.IsNullOrWhiteSpace(roadway))
- return "10080"; // 榛樿鍦板潃
+ return "10080";
+ // 鏌ユ壘鍖归厤鐨勫贩閬撳墠缂�
+ string matchedPrefix = null;
foreach (var kvp in addressMap)
{
if (roadway.Contains(kvp.Key))
- return kvp.Value;
+ {
+ matchedPrefix = kvp.Key;
+ break;
+ }
}
- return "10080"; // 榛樿鍦板潃
+ if (matchedPrefix == null)
+ return "10080";
+
+ var addresses = addressMap[matchedPrefix];
+ if (addresses == null || addresses.Count == 0)
+ return "10080";
+
+ // 鍗曚釜鍦板潃锛岀洿鎺ヨ繑鍥�
+ if (addresses.Count == 1)
+ return addresses[0];
+
+ // 澶氫釜鍦板潃锛屼娇鐢ㄨ疆璇㈡湇鍔�
+ return _roundRobinService.GetNextAddress(matchedPrefix, addresses);
}
/// <summary>
@@ -405,22 +650,12 @@
{
// 1. 鏌ヨ鍒版湡搴撳瓨
var expiredStocks = await _stockInfoService.Repository
- .QueryDataAsync(s => s.OutboundDate <= DateTime.Now
+ .QueryDataNavAsync(s => s.OutboundDate <= DateTime.Now
&& s.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode());
if (expiredStocks == null || !expiredStocks.Any())
{
return WebResponseContent.Instance.OK("鏃犲埌鏈熷簱瀛橀渶瑕佸鐞�");
- }
-
- // 鍔犺浇浣嶇疆璇︽儏
- foreach (var stock in expiredStocks)
- {
- if (stock.LocationId > 0)
- {
- stock.LocationDetails = await _locationInfoService.Repository
- .QueryFirstAsync(s => s.Id == stock.LocationId);
- }
}
// 杩囨护鏈変綅缃笖浣嶇疆鏈夊簱瀛樼殑璁板綍
@@ -456,8 +691,8 @@
// 4. 鑾峰彇閰嶇疆鐨勭洰鏍囧湴鍧�鏄犲皠
var targetAddressMap = _configuration.GetSection("AutoOutboundTask:TargetAddresses")
- .Get<Dictionary<string, string>>()
- ?? new Dictionary<string, string>();
+ .Get<Dictionary<string, List<string>>>()
+ ?? new Dictionary<string, List<string>>();
// 5. 鎵归噺鍒涘缓浠诲姟
var taskList = new List<Dt_Task>();
@@ -481,35 +716,76 @@
TaskType = TaskTypeEnum.Outbound.GetHashCode(),
TaskStatus = TaskStatusEnum.New.GetHashCode(),
Grade = 1,
- TaskNum = await Repository.GetTaskNo(),
+ TaskNum = await BaseDal.GetTaskNo(),
Creater = "system_auto"
};
taskList.Add(task);
}
- var addResult = await BaseDal.AddDataAsync(taskList) > 0;
- if (!addResult)
+ var transactionResult = await ExecuteWithinTransactionAsync(async () =>
{
- return WebResponseContent.Instance.Error($"鎵归噺鍒涘缓浠诲姟澶辫触锛屽叡 {taskList.Count} 涓换鍔�");
+ var addResult = await BaseDal.AddDataAsync(taskList) > 0;
+ if (!addResult)
+ {
+ return WebResponseContent.Instance.Error($"鎵归噺鍒涘缓浠诲姟澶辫触锛屽叡 {taskList.Count} 涓换鍔�");
+ }
+
+ // 浠诲姟鍒涘缓鎴愬姛鍚庯紝鍚屾閿佸畾搴撳瓨鍜岃揣浣嶇姸鎬侊紝閬垮厤閲嶅鍒嗛厤
+ var stocksToUpdate = stocksToProcess
+ .Select(s =>
+ {
+ s.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.GetHashCode();
+ return s;
+ })
+ .ToList();
+
+ var updateStockResult = await _stockInfoService.Repository.UpdateDataAsync(stocksToUpdate);
+ if (!updateStockResult)
+ {
+ return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓鎴愬姛锛屼絾搴撳瓨鐘舵�佹洿鏂板け璐ワ紝鍏� {stocksToUpdate.Count} 鏉�");
+ }
+
+ var locationsToUpdate = stocksToProcess
+ .Where(s => s.LocationDetails != null)
+ .GroupBy(s => s.LocationDetails.Id)
+ .Select(g =>
+ {
+ var location = g.First().LocationDetails;
+ location.LocationStatus = LocationStatusEnum.InStockLock.GetHashCode();
+ return location;
+ })
+ .ToList();
+
+ if (locationsToUpdate.Any())
+ {
+ var updateLocationResult = await _locationInfoService.Repository.UpdateDataAsync(locationsToUpdate);
+ if (!updateLocationResult)
+ {
+ return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓鎴愬姛锛屼絾璐т綅鐘舵�佹洿鏂板け璐ワ紝鍏� {locationsToUpdate.Count} 鏉�");
+ }
+ }
+
+ return WebResponseContent.Instance.OK();
+ });
+ if (!transactionResult.Status)
+ {
+ return transactionResult;
}
// 6. 閫氱煡 WCS锛堝紓姝ワ紝涓嶅奖鍝嶄富娴佺▼锛�
_ = Task.Run(() =>
{
- foreach (var task in taskList)
+ try
{
- try
- {
- var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
- _httpClientHelper.Post<WebResponseContent>(
- "http://logistics-service/api/logistics/notifyoutbound",
- JsonSerializer.Serialize(wmstaskDto));
- }
- catch (Exception ex)
- {
- // WCS 閫氱煡澶辫触涓嶅奖鍝嶄换鍔″垱寤猴紝璁板綍鏃ュ織鍗冲彲
- Console.WriteLine($"WCS 閫氱煡澶辫触锛屼换鍔＄紪鍙�: {task.TaskNum}, 閿欒: {ex.Message}");
- }
+ var wmstaskDtos = _mapper.Map<List<WMSTaskDTO>>(taskList);
+ _httpClientHelper.Post<WebResponseContent>(
+ "http://localhost:9292/api/Task/ReceiveTask",
+ wmstaskDtos.ToJson());
+ }
+ catch (Exception ex)
+ {
+ // WCS 閫氱煡澶辫触涓嶅奖鍝嶄换鍔″垱寤猴紝璁板綍鏃ュ織鍗冲彲
+ Console.WriteLine($"WCS 鎵归噺閫氱煡澶辫触锛屼换鍔℃暟閲�: {taskList.Count}, 閿欒: {ex.Message}");
}
});
@@ -521,6 +797,125 @@
}
}
+ /// <summary>
+ /// 鍒涘缓鏈烘鎵嬬粍鐩樹换鍔�
+ /// </summary>
+ public async Task<WebResponseContent> CreateRobotGroupPalletTaskAsync(StockDTO stock)
+ {
+ return await CreateRobotPalletTaskAsync(
+ stock,
+ "缁勭洏",
+ RobotTaskTypeEnum.GroupPallet,
+ s => string.IsNullOrWhiteSpace(s.TargetPalletNo) ? s.SourcePalletNo : s.TargetPalletNo,
+ requireStockWithoutLocation: false);
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏈烘鎵嬫崲鐩樹换鍔�
+ /// </summary>
+ public async Task<WebResponseContent> CreateRobotChangePalletTaskAsync(StockDTO stock)
+ {
+ return await CreateRobotPalletTaskAsync(
+ stock,
+ "鎹㈢洏",
+ RobotTaskTypeEnum.ChangePallet,
+ s => s.SourcePalletNo,
+ requireStockWithoutLocation: true,
+ stockPalletCodeSelector: s => s.SourcePalletNo);
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏈烘鎵嬫媶鐩樹换鍔�
+ /// </summary>
+ public async Task<WebResponseContent> CreateRobotSplitPalletTaskAsync(StockDTO stock)
+ {
+ return await CreateRobotPalletTaskAsync(
+ stock,
+ "鎷嗙洏",
+ RobotTaskTypeEnum.SplitPallet,
+ s => s.SourcePalletNo,
+ requireStockWithoutLocation: true,
+ stockPalletCodeSelector: s => s.SourcePalletNo);
+ }
+
+ private async Task<WebResponseContent> CreateRobotPalletTaskAsync(
+ StockDTO stock,
+ string taskName,
+ RobotTaskTypeEnum taskType,
+ Func<StockDTO, string?> palletCodeSelector,
+ bool requireStockWithoutLocation,
+ Func<StockDTO, string?>? stockPalletCodeSelector = null)
+ {
+ try
+ {
+ if (stock == null)
+ return WebResponseContent.Instance.Error("浠诲姟鍙傛暟涓嶈兘涓虹┖");
+
+ var palletCode = palletCodeSelector(stock)?.Trim();
+ if (string.IsNullOrWhiteSpace(palletCode))
+ return WebResponseContent.Instance.Error("鎵樼洏鍙蜂笉鑳戒负绌�");
+
+ var sourceLineNo = stock.SourceLineNo?.Trim();
+ var targetLineNo = stock.TargetLineNo?.Trim();
+ if (string.IsNullOrWhiteSpace(sourceLineNo) || string.IsNullOrWhiteSpace(targetLineNo))
+ return WebResponseContent.Instance.Error("鏉ユ簮绾夸綋缂栧彿鍜岀洰鏍囩嚎浣撶紪鍙蜂笉鑳戒负绌�");
+
+ var existingTask = await BaseDal.QueryFirstAsync(t =>
+ t.PalletCode == palletCode &&
+ (t.TaskStatus == TaskRobotStatusEnum.RobotNew.GetHashCode()
+ || t.TaskStatus == TaskRobotStatusEnum.RobotExecuting.GetHashCode()
+ || t.TaskStatus == TaskRobotStatusEnum.RobotPickFinish.GetHashCode()
+ || t.TaskStatus == TaskRobotStatusEnum.RobotPutFinish.GetHashCode()
+ || t.TaskStatus == TaskRobotStatusEnum.RobotPending.GetHashCode()));
+ if (existingTask != null)
+ return WebResponseContent.Instance.Error($"鎵樼洏[{palletCode}]宸插瓨鍦ㄦ湭瀹屾垚浠诲姟");
+
+ Dt_StockInfo? stockInfo = null;
+ if (requireStockWithoutLocation)
+ {
+ var stockPalletCode = (stockPalletCodeSelector ?? palletCodeSelector).Invoke(stock)?.Trim();
+ if (string.IsNullOrWhiteSpace(stockPalletCode))
+ return WebResponseContent.Instance.Error("婧愭墭鐩樺彿涓嶈兘涓虹┖");
+
+ stockInfo = await _stockInfoService.GetStockInfoAsync(stockPalletCode);
+ if (stockInfo == null)
+ return WebResponseContent.Instance.Error($"鎵樼洏[{stockPalletCode}]搴撳瓨涓嶅瓨鍦�");
+
+ if (stockInfo.LocationId > 0 || !string.IsNullOrWhiteSpace(stockInfo.LocationCode))
+ return WebResponseContent.Instance.Error($"鎵樼洏[{stockPalletCode}]搴撳瓨宸茬粦瀹氳揣浣嶏紝涓嶈兘鍒涘缓鏈烘鎵媨taskName}浠诲姟");
+ }
+
+ var task = new Dt_Task
+ {
+ TaskNum = await BaseDal.GetTaskNo(),
+ PalletCode = palletCode,
+ PalletType = stockInfo?.PalletType ?? 0,
+ Roadway = stock.Roadway,
+ TaskType = taskType.GetHashCode(),
+ TaskStatus = TaskRobotStatusEnum.RobotNew.GetHashCode(),
+ SourceAddress = sourceLineNo,
+ TargetAddress = targetLineNo,
+ CurrentAddress = sourceLineNo,
+ NextAddress = targetLineNo,
+ WarehouseId = stockInfo?.WarehouseId ?? 1,
+ Grade = 1,
+ Remark = $"鏈烘鎵媨taskName}",
+ Creater = "system"
+ };
+
+ var result = await Repository.AddDataAsync(task) > 0;
+ if (!result)
+ return WebResponseContent.Instance.Error($"鏈烘鎵媨taskName}浠诲姟鍒涘缓澶辫触");
+
+ var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
+ return WebResponseContent.Instance.OK($"鏈烘鎵媨taskName}浠诲姟鍒涘缓鎴愬姛", wmstaskDto);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"鏈烘鎵媨taskName}浠诲姟鍒涘缓澶辫触: {ex.Message}");
+ }
+ }
+
#endregion WCS閫昏緫澶勭悊
#region 鍒嗗鏌滄帴鍙�
@@ -528,7 +923,7 @@
/// <summary>
/// 鍫嗗灈鏈哄彇鏀捐揣瀹屾垚鍚庣墿娴侀�氱煡鍖栨垚鍒嗗鏌滃畬鎴愪俊鍙�
/// </summary>
- public async Task<WebResponseContent> InOrOutCompletedAsync(InputDto input)
+ public async Task<WebResponseContent> InOrOutCompletedAsync(GradingMachineInputDto input)
{
WebResponseContent content = new WebResponseContent();
if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
@@ -539,30 +934,26 @@
try
{
var stockInfo = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
+
+ int locationStatus;
if (stockInfo == null)
{
var location = await _locationInfoService.GetLocationInfoAsync(input.LocationCode);
-
- OutPutDto outPutDto = new OutPutDto()
- {
- LocationCode = input.LocationCode,
- PalletCode = input.PalletCode,
- IsNormalProcedure = 1,
- LocationStatus = location.LocationStatus
- };
- content.OK(data: outPutDto);
+ locationStatus = location?.LocationStatus ?? 0;
}
else
{
- OutPutDto outPutDto = new OutPutDto()
- {
- LocationCode = input.LocationCode,
- PalletCode = input.PalletCode,
- IsNormalProcedure = 1,
- LocationStatus = stockInfo.LocationDetails.LocationStatus
- };
- content.OK(data: outPutDto);
+ locationStatus = stockInfo.LocationDetails?.LocationStatus ?? 0;
}
+
+ OutputDto outPutDto = new OutputDto()
+ {
+ LocationCode = input.LocationCode,
+ PalletCode = input.PalletCode,
+ IsNormalProcedure = 1,
+ LocationStatus = locationStatus
+ };
+ return content.OK(data: outPutDto);
}
catch (Exception ex)
{
@@ -577,7 +968,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<WebResponseContent> SendLocationStatusAsync(InputDto input)
+ public async Task<WebResponseContent> SendLocationStatusAsync(GradingMachineInputDto input)
{
WebResponseContent content = new WebResponseContent();
if (string.IsNullOrWhiteSpace(input.LocationCode))
@@ -614,7 +1005,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<WebResponseContent> RequestOutboundAsync(InputDto input)
+ public async Task<WebResponseContent> RequestOutboundAsync(GradingMachineInputDto input)
{
WebResponseContent content = new WebResponseContent();
if (string.IsNullOrWhiteSpace(input.LocationCode) || string.IsNullOrWhiteSpace(input.PalletCode))
@@ -673,7 +1064,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<WebResponseContent> GetPalletCodeCellAsync(InputDto input)
+ public async Task<WebResponseContent> GetPalletCodeCellAsync(GradingMachineInputDto input)
{
WebResponseContent content = new WebResponseContent();
if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
@@ -687,7 +1078,7 @@
{
return content.Error("鏈壘鍒板搴旂殑鎵樼洏");
}
- var outPutDtos = stockInfo.Details.Select(x => new OutPutDto()
+ var outPutDtos = stockInfo.Details.Select(x => new OutputDto()
{
LocationCode = input.LocationCode,
PalletCode = input.PalletCode,
@@ -706,4 +1097,4 @@
#endregion 鍒嗗鏌滄帴鍙�
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3