From 5171d3f59b89389bf75293afd210cfa6de4ccff7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 10 四月 2026 23:03:49 +0800
Subject: [PATCH] feat: 添加堆垛机相关常量类并重构代码使用常量
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 751 ++++++++-------------------------------------------------
1 files changed, 110 insertions(+), 641 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 4b23b23..f64135c 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,16 +1,26 @@
-锘縰sing AutoMapper;
+using Mapster;
+using MapsterMapper;
using Microsoft.Extensions.Configuration;
using SqlSugar;
+using System.DirectoryServices.Protocols;
using System.Text.Json;
+using WIDESEA_Common.Constants;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO;
+using WIDESEA_Core.Core;
+using WIDESEA_Core.Enums;
+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_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
@@ -24,6 +34,12 @@
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;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IRecordService _recordService;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -42,337 +58,40 @@
IStockInfoService stockInfoService,
ILocationInfoService locationInfoService,
HttpClientHelper httpClientHelper,
- IConfiguration configuration) : base(BaseDal)
+ IConfiguration configuration,
+ RoundRobinService roundRobinService,
+ IMesService mesService,
+ ITask_HtyService task_HtyService,
+ IStockInfo_HtyService stockInfo_HtyService,
+ IUnitOfWorkManage unitOfWorkManage,
+ IRecordService recordService) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
_locationInfoService = locationInfoService;
_httpClientHelper = httpClientHelper;
_configuration = configuration;
- }
-
- #region WCS閫昏緫澶勭悊
-
- /// <summary>
- /// 鍒涘缓浠诲姟锛堢粍鐩樺叆搴撲换鍔°�佺┖鎵樼洏鍥炲簱浠诲姟锛�
- /// </summary>
- public async Task<WebResponseContent> CreateTaskInboundAsync(CreateTaskDto taskDto)
- {
- try
- {
- WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
- if (content.Status)
- {
- return content;
- }
-
- if (string.IsNullOrWhiteSpace(taskDto.PalletCode) ||
- string.IsNullOrWhiteSpace(taskDto.Roadway))
- {
- return WebResponseContent.Instance.Error("鏃犳晥鐨勪换鍔¤鎯�");
- }
-
- if (taskDto.TaskType != TaskTypeEnum.Inbound && taskDto.TaskType != TaskTypeEnum.InEmpty)
- {
- return WebResponseContent.Instance.Error("鏃犳晥鐨勪换鍔¤鎯�");
- }
-
- // 浣跨敤 switch 琛ㄨ揪寮忔槧灏勪换鍔＄被鍨�
- int taskInboundType = taskDto.TaskType switch
- {
- TaskTypeEnum.Inbound => TaskInboundTypeEnum.Inbound.GetHashCode(),
- TaskTypeEnum.InEmpty => TaskInboundTypeEnum.InEmpty.GetHashCode(),
- _ => 0 // 鐞嗚涓婁笉浼氳蛋鍒拌繖閲岋紝鍥犱负宸茬粡楠岃瘉杩囦簡
- };
-
- var task = new Dt_Task
- {
- TaskNum = await BaseDal.GetTaskNo(),
- PalletCode = taskDto.PalletCode,
- PalletType = taskDto.PalletType,
- Roadway = taskDto.Roadway,
- TaskType = taskInboundType,
- TaskStatus = TaskInStatusEnum.InNew.GetHashCode(),
- SourceAddress = taskDto.SourceAddress,
- TargetAddress = taskDto.TargetAddress,
- CurrentAddress = taskDto.SourceAddress,
- NextAddress = taskDto.TargetAddress,
- WarehouseId = taskDto.WarehouseId,
- Grade = 1,
- Creater = "system"
- };
-
- var result = await Repository.AddDataAsync(task) > 0;
- if (!result) return WebResponseContent.Instance.Error("浠诲姟鍒涘缓澶辫触");
-
- var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
- return WebResponseContent.Instance.OK("浠诲姟鍒涘缓鎴愬姛", wmstaskDto);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
- }
+ _roundRobinService = roundRobinService;
+ _mesService = mesService;
+ _task_HtyService = task_HtyService;
+ _stockInfo_HtyService = stockInfo_HtyService;
+ _unitOfWorkManage = unitOfWorkManage;
+ _recordService = recordService;
}
/// <summary>
- /// 鏍规嵁鎸囧畾鐨勪换鍔¤鎯呭紓姝ュ垱寤烘柊鐨勫嚭搴撲换鍔�
+ /// 鏌ユ壘鎵樼洏鏄惁瀛樺湪鏈畬鎴愪换鍔°��
/// </summary>
- public async Task<WebResponseContent> CreateTaskOutboundAsync(CreateTaskDto taskDto)
+ private async Task<WebResponseContent> GetTaskByPalletCodeAsync(string palletCode)
{
try
{
- var stockResult = await _stockInfoService.GetStockInfoAsync(taskDto.WarehouseId);
- if (stockResult == null || !stockResult.Any())
- return WebResponseContent.Instance.Error("鏈壘鍒板簱瀛樹俊鎭�");
-
- var taskList = stockResult.Select(item => new Dt_Task
- {
- WarehouseId = item.WarehouseId,
- PalletCode = item.PalletCode,
- PalletType = item.PalletType,
- SourceAddress = item.LocationCode,
- TargetAddress = taskDto.TargetAddress,
- Roadway = item.LocationDetails.RoadwayNo,
- TaskType = TaskTypeEnum.Outbound.GetHashCode(),
- TaskStatus = TaskStatusEnum.New.GetHashCode(),
- Grade = 1,
- TaskNum = 0,
- CurrentAddress = item.LocationCode,
- NextAddress = taskDto.TargetAddress,
- Creater = "system",
- }).ToList();
-
- var result = await BaseDal.AddDataAsync(taskList) > 0;
- var wmstaskDto = result ? _mapper.Map<WMSTaskDTO>(taskList) : null;
- return WebResponseContent.Instance.OK(result ? "浠诲姟鍒涘缓鎴愬姛" : "浠诲姟鍒涘缓澶辫触", wmstaskDto ?? new object());
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鑾峰彇鍙叆搴撹揣浣�
- /// </summary>
- public async Task<WebResponseContent> GetTasksLocationAsync(CreateTaskDto taskDto)
- {
- try
- {
- var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
- if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
-
- 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();
-
- var updateResult = await BaseDal.UpdateDataAsync(task);
- var locationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
-
- return WebResponseContent.Instance.OK(
- updateResult && locationResult ? "浠诲姟鏇存柊鎴愬姛" : "浠诲姟鏇存柊澶辫触",
- locationInfo.LocationCode);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"鑾峰彇浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚锛氭坊鍔犲簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
- /// </summary>
- public async Task<WebResponseContent> InboundFinishTaskAsync(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);
- 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();
-
- 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("浠诲姟瀹屾垚");
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚 锛氫慨鏀瑰簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
- /// </summary>
- public async Task<WebResponseContent> OutboundFinishTaskAsync(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); stockInfo.LocationCode = location.LocationCode;
- stockInfo.LocationId = location.Id;
- stockInfo.OutboundDate = DateTime.Now;
-
- 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 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("浠诲姟瀹屾垚");
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鍒涘缓绌烘墭鐩樺叆搴撲换鍔�
- /// </summary>
- /// <param name="taskDto"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> CreateTaskInboundTrayAsync(CreateTaskDto taskDto)
- {
- try
- {
- WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
- if (content.Status)
- {
- return content;
- }
-
- //var tasks = await BaseDal.QueryAsync(s => s.PalletCode == palletCode);
- //if (tasks == null || !tasks.Any())
- // return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
- //var taskDtos = _mapper.Map<List<WMSTaskDTO>>(tasks);
- return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛"/*, taskDtos*/);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鍒涘缓绌烘墭鐩樺嚭搴撲换鍔�
- /// </summary>
- /// <param name="taskDto"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> GetOutBoundTrayTaskAsync(CreateTaskDto taskDto)
- {
- try
- {
-
- var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => x.LocationDetails.WarehouseId == taskDto.WarehouseId && x.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode() && x.StockStatus == StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode());
- if (stockInfo == null)
- return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
-
- var task = new Dt_Task()
- {
- WarehouseId = stockInfo.LocationDetails.WarehouseId,
- PalletCode = stockInfo.PalletCode,
- PalletType = stockInfo.PalletType,
- SourceAddress = stockInfo.LocationCode,
- CurrentAddress = stockInfo.LocationCode,
- NextAddress = taskDto.TargetAddress,
- TargetAddress = taskDto.TargetAddress,
- Roadway = stockInfo.LocationDetails.RoadwayNo,
- TaskType = TaskTypeEnum.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);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 淇敼浠诲姟鐘舵�侊紙鏍规嵁浠诲姟ID淇敼涓烘寚瀹氱姸鎬侊級
- /// </summary>
- /// <param name="taskId"></param>
- /// <param name="newStatus"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> UpdateTaskByStatusAsync(int taskId, int newStatus)
- {
- try
- {
- var tasks = await BaseDal.QueryFirstAsync(s => s.TaskNum == taskId);
- if (tasks == null)
+ var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
+ if (task == null)
return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
- tasks.TaskStatus = newStatus;
- await BaseDal.UpdateDataAsync(tasks);
-
- return WebResponseContent.Instance.OK("淇敼鎴愬姛", tasks);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"淇敼澶辫触: {ex.Message}");
- }
- }
-
-
- /// <summary>
- /// 鏌ユ壘鎵樼洏鏄惁鏈変换鍔�
- /// </summary>
- /// <param name="palletCode"></param>
- /// <returns></returns>
- private async Task<WebResponseContent> GetTasksByPalletCodeAsync(string palletCode)
- {
- try
- {
- var tasks = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
- if (tasks == 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)
{
@@ -381,346 +100,96 @@
}
/// <summary>
- /// 鏍规嵁宸烽亾纭畾鐩爣鍦板潃
+ /// 淇濆瓨浠诲姟鍘嗗彶銆�
/// </summary>
- private string DetermineTargetAddress(string roadway, Dictionary<string, string> addressMap)
+ private async Task<WebResponseContent> SaveTaskHistoryAsync(Dt_Task task, string operateType)
+ {
+ var historyTask = _mapper.Map<Dt_Task_Hty>(task);
+ historyTask.InsertTime = DateTime.Now;
+ historyTask.OperateType = operateType;
+
+ var saved = await _task_HtyService.Repository.AddDataAsync(historyTask) > 0;
+ return saved
+ ? WebResponseContent.Instance.OK()
+ : WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
+ }
+
+ /// <summary>
+ /// 淇濆瓨搴撳瓨鍘嗗彶銆�
+ /// </summary>
+ private async Task<WebResponseContent> SaveStockHistoryAsync(Dt_StockInfo stockInfo, string operateType)
+ {
+ var historyStock = _mapper.Map<Dt_StockInfo_Hty>(stockInfo);
+ historyStock.InsertTime = DateTime.Now;
+ historyStock.OperateType = operateType;
+
+ var saved = await _stockInfo_HtyService.Repository.AddDataAsync(historyStock) > 0;
+ return saved
+ ? WebResponseContent.Instance.OK()
+ : WebResponseContent.Instance.Error("搴撳瓨鍘嗗彶淇濆瓨澶辫触");
+ }
+
+ /// <summary>
+ /// 瀹屾垚浠诲姟鍚庣粺涓�澶勭悊銆�
+ /// </summary>
+ private async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task, string operateType = "")
+ {
+ var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteTaskResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ return await SaveTaskHistoryAsync(task, operateType);
+ }
+
+ /// <summary>
+ /// 鏍规嵁宸烽亾纭畾鐩爣鍦板潃锛屾敮鎸佸鍑哄簱鍙ｈ疆璇€��
+ /// </summary>
+ private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
{
if (string.IsNullOrWhiteSpace(roadway))
- return "10080"; // 榛樿鍦板潃
+ return TaskAddressConstants.DEFAULT_ADDRESS;
+ 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 TaskAddressConstants.DEFAULT_ADDRESS;
+
+ if (!addressMap.TryGetValue(matchedPrefix, out var addresses) || addresses == null || addresses.Count == 0)
+ return TaskAddressConstants.DEFAULT_ADDRESS;
+
+ if (addresses.Count == 1)
+ return addresses[0];
+
+ return _roundRobinService.GetNextAddress(matchedPrefix, addresses);
}
/// <summary>
- /// 鑷姩鍒涘缓鍑哄簱浠诲姟 - 鏌ヨ鍒版湡搴撳瓨骞跺垱寤轰换鍔�
+ /// 鏍规嵁搴撳瓨 Remark 纭畾鐩爣鍦板潃锛圙W_1鈫抂11001,11010]杞锛孏W_2鈫扖WSC1锛孋W_1鈫�22001锛夈��
/// </summary>
- public async Task<WebResponseContent> CreateAutoOutboundTasksAsync()
+ private string DetermineTargetAddressByRemark(string remark, string roadway, Dictionary<string, List<string>> addressMap)
{
- try
+ // 鏍规嵁 Remark 纭畾鐩爣鍦板潃
+ if (!string.IsNullOrWhiteSpace(remark))
{
- // 1. 鏌ヨ鍒版湡搴撳瓨
- var expiredStocks = await _stockInfoService.Repository
- .QueryDataAsync(s => s.OutboundDate <= DateTime.Now
- && s.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode());
-
- if (expiredStocks == null || !expiredStocks.Any())
+ return remark switch
{
- 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, string>>()
- ?? new Dictionary<string, 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 = 0, // 浣跨敤 0 璁╂暟鎹簱鑷姩鐢熸垚浠诲姟鍙�
- 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://logistics-service/api/logistics/notifyoutbound",
- JsonSerializer.Serialize(wmstaskDto));
- }
- catch (Exception ex)
- {
- // WCS 閫氱煡澶辫触涓嶅奖鍝嶄换鍔″垱寤猴紝璁板綍鏃ュ織鍗冲彲
- Console.WriteLine($"WCS 閫氱煡澶辫触锛屼换鍔＄紪鍙�: {task.TaskNum}, 閿欒: {ex.Message}");
- }
- }
- });
-
- return WebResponseContent.Instance.OK($"鎴愬姛鍒涘缓 {taskList.Count} 涓嚭搴撲换鍔�", taskList.Count);
+ StockRemarkConstants.GW1 => _roundRobinService.GetNextAddress(StockRemarkConstants.GW1, TaskAddressConstants.GW1_ADDRESSES.ToList()),
+ StockRemarkConstants.GW2 => TaskAddressConstants.GW2_ADDRESS,
+ StockRemarkConstants.CW1 => TaskAddressConstants.CW1_ADDRESS,
+ _ => DetermineTargetAddress(roadway, addressMap)
+ };
}
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"鑷姩鍒涘缓鍑哄簱浠诲姟澶辫触: {ex.Message}");
- }
+
+ // Remark 涓虹┖鏃讹紝鍥為��鍒板贩閬撻厤缃�
+ return DetermineTargetAddress(roadway, addressMap);
}
-
- #endregion WCS閫昏緫澶勭悊
-
- #region 鍒嗗鏌滄帴鍙�
-
- /// <summary>
- /// 鍫嗗灈鏈哄彇鏀捐揣瀹屾垚鍚庣墿娴侀�氱煡鍖栨垚鍒嗗鏌滃畬鎴愪俊鍙�
- /// </summary>
- public async Task<WebResponseContent> InOrOutCompletedAsync(InputDto input)
- {
- WebResponseContent content = new WebResponseContent();
- if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
- {
- return content.Error($"鎵樼洏鍙锋垨鑰呰揣浣嶇紪鍙蜂笉鑳戒负绌�");
- }
-
- try
- {
- var stockInfo = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
- 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);
- }
- else
- {
- OutPutDto outPutDto = new OutPutDto()
- {
- LocationCode = input.LocationCode,
- PalletCode = input.PalletCode,
- IsNormalProcedure = 1,
- LocationStatus = stockInfo.LocationDetails.LocationStatus
- };
- content.OK(data: outPutDto);
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
-
- return content;
- }
-
- /// <summary>
- /// 鍖栨垚鍒嗗鏌滃畾鏃跺悜鐗╂祦鏇存柊鍒嗗鏌滅姸鎬佷俊鎭�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> SendLocationStatusAsync(InputDto input)
- {
- WebResponseContent content = new WebResponseContent();
- if (string.IsNullOrWhiteSpace(input.LocationCode))
- {
- return content.Error($"璐т綅缂栧彿涓嶈兘涓虹┖");
- }
-
- try
- {
- var result = await _locationInfoService.Db.Updateable<Dt_LocationInfo>()
- .SetColumns(s => new Dt_LocationInfo
- {
- LocationStatus = input.LocationStatus
- }).Where(s => s.LocationCode == input.LocationCode).ExecuteCommandAsync() > 0;
-
- if (result)
- {
- content.OK("鏇存柊鎴愬姛");
- }
- else
- {
- content.Error("鏇存柊澶辫触");
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 鍒嗗鏌滃伐浣滃畬鎴愬悗璋冪敤姝ゆ帴鍙ｉ�氱煡鐗╂祦鍑哄簱
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> RequestOutboundAsync(InputDto input)
- {
- WebResponseContent content = new WebResponseContent();
- if (string.IsNullOrWhiteSpace(input.LocationCode) || string.IsNullOrWhiteSpace(input.PalletCode))
- {
- return content.Error($"鎵樼洏鍙锋垨鑰呰揣浣嶇紪鍙蜂笉鑳戒负绌�");
- }
- try
- {
- var stock = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
- if (stock == null)
- {
- content.Error("鏈壘鍒板搴旂殑鎵樼洏");
- }
- else
- {
- var taskList = new Dt_Task
- {
- WarehouseId = stock.WarehouseId,
- PalletCode = stock.PalletCode,
- PalletType = stock.PalletType,
- SourceAddress = stock.LocationCode,
- CurrentAddress = stock.LocationCode,
- NextAddress = "10080",
- TargetAddress = "10081",
- Roadway = stock.LocationDetails.RoadwayNo,
- TaskType = TaskTypeEnum.Outbound.GetHashCode(),
- TaskStatus = TaskStatusEnum.New.GetHashCode(),
- Grade = 1,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "system",
- };
-
- var result = await BaseDal.AddDataAsync(taskList) > 0;
- var wmstaskDto = result ? _mapper.Map<WMSTaskDTO>(taskList) : null;
-
- var httpResponse = _httpClientHelper.Post<WebResponseContent>("http://logistics-service/api/logistics/notifyoutbound", JsonSerializer.Serialize(wmstaskDto)).Data;
- if (result && httpResponse != null)
- {
- content.OK("鍑哄簱璇锋眰鎴愬姛");
- }
- else
- {
- content.Error("鍑哄簱璇锋眰澶辫触");
- }
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 鍏ュ簱瀹屾垚鍒嗗璋冪敤鑾峰彇鎵樼洏涓婃瘡涓�氶亾鐢佃姱
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> GetPalletCodeCellAsync(InputDto input)
- {
- WebResponseContent content = new WebResponseContent();
- if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
- {
- return content.Error($"鎵樼洏鍙锋垨鑰呰揣浣嶇紪鍙蜂笉鑳戒负绌�");
- }
- try
- {
- var stockInfo = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
- if (stockInfo == null)
- {
- return content.Error("鏈壘鍒板搴旂殑鎵樼洏");
- }
- var outPutDtos = stockInfo.Details.Select(x => new OutPutDto()
- {
- LocationCode = input.LocationCode,
- PalletCode = input.PalletCode,
- IsNormalProcedure = 1,
- LocationStatus = stockInfo.LocationDetails.LocationStatus,
- CellCode = x.SerialNumber,
- Channel = x.InboundOrderRowNo.ToString()
- }).ToList();
- return content.OK(data: outPutDtos);
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
- #endregion 鍒嗗鏌滄帴鍙�
}
}
\ No newline at end of file
--
Gitblit v1.9.3