From 5af11cc200dd5ebe474b9c0475883b0e6d1e3759 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 11 三月 2026 10:00:49 +0800
Subject: [PATCH] 重构整个项目：改进代码质量和架构
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 206 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 195 insertions(+), 11 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 5606824..54429f5 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 Microsoft.Extensions.Configuration;
using SqlSugar;
using System.Text.Json;
using WIDESEA_Common.LocationEnum;
@@ -7,7 +8,8 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO;
+using WIDESEA_Core.Core;
+using WIDESEA_DTO.GradingMachine;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
using WIDESEA_IStockService;
@@ -22,6 +24,8 @@
private readonly IStockInfoService _stockInfoService;
private readonly ILocationInfoService _locationInfoService;
private readonly HttpClientHelper _httpClientHelper;
+ private readonly IConfiguration _configuration;
+ private readonly RoundRobinService _roundRobinService;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -39,12 +43,16 @@
IMapper mapper,
IStockInfoService stockInfoService,
ILocationInfoService locationInfoService,
- HttpClientHelper httpClientHelper) : base(BaseDal)
+ HttpClientHelper httpClientHelper,
+ IConfiguration configuration,
+ RoundRobinService roundRobinService) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
_locationInfoService = locationInfoService;
_httpClientHelper = httpClientHelper;
+ _configuration = configuration;
+ _roundRobinService = roundRobinService;
}
#region WCS閫昏緫澶勭悊
@@ -165,7 +173,7 @@
task.CurrentAddress = task.SourceAddress;
task.NextAddress = locationInfo.LocationCode;
task.TargetAddress = locationInfo.LocationCode;
- task.TaskStatus = TaskStatusEnum.Line_Finish.GetHashCode();
+ task.TaskStatus = TaskInStatusEnum.Line_InFinish.GetHashCode();
var updateResult = await BaseDal.UpdateDataAsync(task);
var locationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
@@ -202,6 +210,7 @@
var r when r.Contains("CW") => DateTime.Now.AddHours(1),
_ => DateTime.Now
};
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
@@ -338,7 +347,7 @@
{
try
{
- var tasks = await BaseDal.QueryFirstAsync(s => s.TaskId == taskId);
+ var tasks = await BaseDal.QueryFirstAsync(s => s.TaskNum == taskId);
if (tasks == null)
return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
@@ -375,6 +384,181 @@
}
}
+ /// <summary>
+ /// 鏍规嵁宸烽亾纭畾鐩爣鍦板潃锛堟敮鎸佸鍑哄簱鍙ｈ疆璇級
+ /// </summary>
+ private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
+ {
+ if (string.IsNullOrWhiteSpace(roadway))
+ return "10080";
+
+ // 鏌ユ壘鍖归厤鐨勫贩閬撳墠缂�
+ string matchedPrefix = null;
+ foreach (var kvp in addressMap)
+ {
+ if (roadway.Contains(kvp.Key))
+ {
+ matchedPrefix = kvp.Key;
+ break;
+ }
+ }
+
+ 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>
+ /// 鑷姩鍒涘缓鍑哄簱浠诲姟 - 鏌ヨ鍒版湡搴撳瓨骞跺垱寤轰换鍔�
+ /// </summary>
+ public async Task<WebResponseContent> CreateAutoOutboundTasksAsync()
+ {
+ try
+ {
+ // 1. 鏌ヨ鍒版湡搴撳瓨
+ var expiredStocks = await _stockInfoService.Repository
+ .QueryDataAsync(s => s.OutboundDate <= DateTime.Now
+ && s.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode());
+
+ if (expiredStocks == null || !expiredStocks.Any())
+ {
+ return WebResponseContent.Instance.OK("鏃犲埌鏈熷簱瀛橀渶瑕佸鐞�");
+ }
+
+ // 鎵归噺鍔犺浇浣嶇疆璇︽儏锛堜紭鍖� N+1 鏌ヨ闂锛�
+ var locationIds = expiredStocks
+ .Where(s => s.LocationId > 0)
+ .Select(s => s.LocationId)
+ .Distinct()
+ .Cast<object>()
+ .ToList();
+
+ if (locationIds.Any())
+ {
+ var locations = await _locationInfoService.Repository
+ .QureyDataByIdsAsync(locationIds);
+
+ // 鍒涘缓浣嶇疆瀛楀吀浠ヤ究蹇�熸煡鎵�
+ var locationDict = locations.ToDictionary(l => l.Id, l => l);
+
+ // 涓烘瘡涓簱瀛樺叧鑱斾綅缃鎯�
+ foreach (var stock in expiredStocks)
+ {
+ if (stock.LocationId > 0 && locationDict.ContainsKey(stock.LocationId))
+ {
+ stock.LocationDetails = locationDict[stock.LocationId];
+ }
+ }
+ }
+
+ // 杩囨护鏈変綅缃笖浣嶇疆鏈夊簱瀛樼殑璁板綍
+ expiredStocks = expiredStocks
+ .Where(s => s.LocationDetails != null
+ && s.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode())
+ .ToList();
+
+ if (!expiredStocks.Any())
+ {
+ return WebResponseContent.Instance.OK("鏃犵鍚堟潯浠剁殑鍒版湡搴撳瓨");
+ }
+
+ // 2. 妫�鏌ュ凡瀛樺湪鐨勪换鍔�
+ var palletCodes = expiredStocks.Select(s => s.PalletCode).ToList();
+ var existingTasks = await Repository.QueryDataAsync(t =>
+ palletCodes.Contains(t.PalletCode)
+ && (t.TaskStatus == TaskStatusEnum.New.GetHashCode()
+ || t.TaskStatus == TaskStatusEnum.SC_Executing.GetHashCode()
+ || t.TaskStatus == TaskInStatusEnum.InNew.GetHashCode()));
+
+ var processedPallets = existingTasks.Select(t => t.PalletCode).ToHashSet();
+
+ // 3. 绛涢�夐渶瑕佸鐞嗙殑搴撳瓨
+ var stocksToProcess = expiredStocks
+ .Where(s => !processedPallets.Contains(s.PalletCode))
+ .ToList();
+
+ if (!stocksToProcess.Any())
+ {
+ return WebResponseContent.Instance.OK("鎵�鏈夊埌鏈熷簱瀛樺凡瀛樺湪浠诲姟");
+ }
+
+ // 4. 鑾峰彇閰嶇疆鐨勭洰鏍囧湴鍧�鏄犲皠
+ var targetAddressMap = _configuration.GetSection("AutoOutboundTask:TargetAddresses")
+ .Get<Dictionary<string, List<string>>>()
+ ?? new Dictionary<string, List<string>>();
+
+ // 5. 鎵归噺鍒涘缓浠诲姟
+ var taskList = new List<Dt_Task>();
+ foreach (var stock in stocksToProcess)
+ {
+ // 鏍规嵁宸烽亾纭畾鐩爣鍦板潃
+ var targetAddress = DetermineTargetAddress(
+ stock.LocationDetails?.RoadwayNo ?? "",
+ targetAddressMap);
+
+ var task = new Dt_Task
+ {
+ WarehouseId = stock.WarehouseId,
+ PalletCode = stock.PalletCode,
+ PalletType = stock.PalletType,
+ SourceAddress = stock.LocationCode,
+ CurrentAddress = stock.LocationCode,
+ NextAddress = targetAddress,
+ TargetAddress = targetAddress,
+ Roadway = stock.LocationDetails?.RoadwayNo ?? "",
+ TaskType = TaskTypeEnum.Outbound.GetHashCode(),
+ TaskStatus = TaskStatusEnum.New.GetHashCode(),
+ Grade = 1,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "system_auto"
+ };
+ taskList.Add(task);
+ }
+
+ var addResult = await BaseDal.AddDataAsync(taskList) > 0;
+ if (!addResult)
+ {
+ return WebResponseContent.Instance.Error($"鎵归噺鍒涘缓浠诲姟澶辫触锛屽叡 {taskList.Count} 涓换鍔�");
+ }
+
+ // 6. 閫氱煡 WCS锛堝紓姝ワ紝涓嶅奖鍝嶄富娴佺▼锛�
+ _ = Task.Run(() =>
+ {
+ foreach (var task in taskList)
+ {
+ try
+ {
+ var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
+ _httpClientHelper.Post<WebResponseContent>(
+ "http://localhost:9292/api/Task/ReceiveTask",
+ JsonSerializer.Serialize(wmstaskDto));
+ }
+ catch (Exception ex)
+ {
+ // WCS 閫氱煡澶辫触涓嶅奖鍝嶄换鍔″垱寤猴紝璁板綍鏃ュ織鍗冲彲
+ Console.WriteLine($"WCS 閫氱煡澶辫触锛屼换鍔＄紪鍙�: {task.TaskNum}, 閿欒: {ex.Message}");
+ }
+ }
+ });
+
+ return WebResponseContent.Instance.OK($"鎴愬姛鍒涘缓 {taskList.Count} 涓嚭搴撲换鍔�", taskList.Count);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"鑷姩鍒涘缓鍑哄簱浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
#endregion WCS閫昏緫澶勭悊
#region 鍒嗗鏌滄帴鍙�
@@ -382,7 +566,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))
@@ -397,7 +581,7 @@
{
var location = await _locationInfoService.GetLocationInfoAsync(input.LocationCode);
- OutPutDto outPutDto = new OutPutDto()
+ OutputDto outPutDto = new OutputDto()
{
LocationCode = input.LocationCode,
PalletCode = input.PalletCode,
@@ -408,7 +592,7 @@
}
else
{
- OutPutDto outPutDto = new OutPutDto()
+ OutputDto outPutDto = new OutputDto()
{
LocationCode = input.LocationCode,
PalletCode = input.PalletCode,
@@ -431,7 +615,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))
@@ -468,7 +652,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))
@@ -527,7 +711,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))
@@ -541,7 +725,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,
--
Gitblit v1.9.3