From fe2a1e74780259605cd230e6f9c629c3dd7fdf15 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 10 四月 2026 20:19:06 +0800
Subject: [PATCH] feat: 添加消防任务支持并修复堆垛机状态处理
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 30 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
index 4ee2d5b..8d2a3ac 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
@@ -182,22 +182,53 @@
if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
// 鍒ゆ柇鏄笉鏄瀬鍗峰簱浠诲姟
- //if (taskDto.WarehouseId == (int)WarehouseEnum.FJ1 || taskDto.WarehouseId == (int)WarehouseEnum.ZJ1)
- //{
- // return WebResponseContent.Instance.OK();
- //}
+ if (taskDto.WarehouseId == (int)WarehouseEnum.FJ1 || taskDto.WarehouseId == (int)WarehouseEnum.ZJ1)
+ {
+
+ return await CompleteAgvInboundTaskAsync(taskDto);
+ }
return await ExecuteWithinTransactionAsync(async () =>
{
WebResponseContent content = new WebResponseContent();
stockInfo.LocationCode = location.LocationCode;
stockInfo.LocationId = location.Id;
- stockInfo.OutboundDate = task.Roadway switch
+
+ var now = DateTime.Now;
+ if (task.Roadway.Contains("GW"))
{
- var r when r.Contains("GW") => DateTime.Now.AddHours(2),
- var r when r.Contains("CW") => DateTime.Now.AddHours(1),
- _ => DateTime.Now
- };
+ if (stockInfo.Remark.IsNullOrEmpty())
+ {
+ stockInfo.OutboundDate = now.AddHours(16);
+ stockInfo.Remark = "GW_1";
+ }
+ else if (stockInfo.Remark == "GW_1")
+ {
+ stockInfo.OutboundDate = now.AddHours(24);
+ stockInfo.Remark = "GW_2";
+ }
+ else
+ {
+ stockInfo.OutboundDate = now.AddHours(16);
+ }
+ }
+ else if (task.Roadway.Contains("CW"))
+ {
+ if (stockInfo.Remark == "GW_2")
+ {
+ stockInfo.OutboundDate = now.AddHours(12);
+ stockInfo.Remark = "CW_1";
+ }
+ else
+ {
+ stockInfo.OutboundDate = now.AddHours(12);
+ }
+ }
+ else
+ {
+ stockInfo.OutboundDate = now;
+ }
+
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
@@ -207,18 +238,18 @@
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 ?? "鏈煡閿欒"}");
- }
+ //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, "鍏ュ簱瀹屾垚");
});
}
@@ -425,6 +456,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("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
@@ -445,12 +483,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)
{
@@ -775,6 +823,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
{
@@ -784,9 +833,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,
@@ -809,4 +858,4 @@
#endregion WCS閫昏緫澶勭悊
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3