From 559bb7b4be83575cc5fedee98484647243c96f89 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 08 四月 2026 15:57:44 +0800
Subject: [PATCH] feat: 空托盘出库完整流程 + 输送线调度优化 + S7Simulator 协议同步增强
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
index 71a7821..5c80729 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
@@ -426,6 +426,13 @@
{
try
{
+ var dt_Task = await BaseDal.QueryFirstAsync(x => x.TargetAddress == taskDto.TargetAddress);
+ if (!dt_Task.IsNullOrEmpty())
+ {
+ var taskDTO = dt_Task.Adapt<WMSTaskDTO>();
+ return WebResponseContent.Instance.OK("浠诲姟鍒涘缓鎴愬姛", taskDTO);
+ }
+
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("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
@@ -446,12 +453,22 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "system",
};
- var taskDtos = task.Adapt<WMSTaskDTO>();
- var addResult = await BaseDal.AddDataAsync(task) > 0;
- if (!addResult)
- return WebResponseContent.Instance.Error("浠诲姟鍒涘缓澶辫触");
- return WebResponseContent.Instance.OK("浠诲姟鍒涘缓鎴愬姛", taskDtos);
+ return await ExecuteWithinTransactionAsync(async () =>
+ {
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationId);
+ locationInfo.LocationStatus = LocationStatusEnum.InStockLock.GetHashCode();
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+ if (!updateLocationResult)
+ return WebResponseContent.Instance.Error("浠诲姟鍒涘缓澶辫触");
+
+ 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)
{
@@ -776,6 +793,7 @@
if (stockInfo.LocationId > 0 || !string.IsNullOrWhiteSpace(stockInfo.LocationCode))
return WebResponseContent.Instance.Error($"鎵樼洏[{stockPalletCode}]搴撳瓨宸茬粦瀹氳揣浣嶏紝涓嶈兘鍒涘缓鏈烘鎵媨taskName}浠诲姟");
}
+ var section = App.Configuration.GetSection("RobotTaskAddressRules").GetSection(targetLineNo).GetChildren().Select(c => c.Value).ToArray();
var task = new Dt_Task
{
@@ -785,9 +803,9 @@
Roadway = stock.Roadway ?? string.Empty,
TaskType = taskType.GetHashCode(),
TaskStatus = TaskRobotStatusEnum.RobotNew.GetHashCode(),
- SourceAddress = sourceLineNo,
- TargetAddress = targetLineNo,
- CurrentAddress = sourceLineNo,
+ SourceAddress = section[0],
+ TargetAddress = section[1],
+ CurrentAddress = targetLineNo,
NextAddress = targetLineNo,
WarehouseId = stockInfo?.WarehouseId ?? 1,
Grade = 1,
--
Gitblit v1.9.3