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 | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index e06a6cf..f64135c 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -4,6 +4,7 @@
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;
@@ -146,7 +147,7 @@
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)
@@ -159,10 +160,10 @@
}
if (matchedPrefix == null)
- return "10080";
+ return TaskAddressConstants.DEFAULT_ADDRESS;
if (!addressMap.TryGetValue(matchedPrefix, out var addresses) || addresses == null || addresses.Count == 0)
- return "10080";
+ return TaskAddressConstants.DEFAULT_ADDRESS;
if (addresses.Count == 1)
return addresses[0];
@@ -180,9 +181,9 @@
{
return remark switch
{
- "GW_1" => _roundRobinService.GetNextAddress("GW_1", new List<string> { "11001", "11010" }),
- "GW_2" => "CWSC1",
- "CW_1" => "22001",
+ StockRemarkConstants.GW1 => _roundRobinService.GetNextAddress(StockRemarkConstants.GW1, TaskAddressConstants.GW1_ADDRESSES.ToList()),
+ StockRemarkConstants.GW2 => TaskAddressConstants.GW2_ADDRESS,
+ StockRemarkConstants.CW1 => TaskAddressConstants.CW1_ADDRESS,
_ => DetermineTargetAddress(roadway, addressMap)
};
}
--
Gitblit v1.9.3