From b690250002ee04f4309e6a90fd16fbfd9bd959e2 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 01 五月 2026 23:11:23 +0800
Subject: [PATCH] feat(router): 添加托盘操作页面路由

---
 Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |   46 ++++++++++++++++++++++++++++------------------
 1 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index e06a6cf..b5fe575 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,22 +1,14 @@
-using Mapster;
 using MapsterMapper;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using SqlSugar;
-using System.DirectoryServices.Protocols;
-using System.Text.Json;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.StockEnum;
+using WIDESEA_Common.Constants;
 using WIDESEA_Common.TaskEnum;
-using WIDESEA_Common.WareHouseEnum;
 using WIDESEA_Core;
 using WIDESEA_Core.BaseRepository;
 using WIDESEA_Core.BaseServices;
 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;
@@ -39,6 +31,12 @@
         private readonly IStockInfo_HtyService _stockInfo_HtyService;
         private readonly IUnitOfWorkManage _unitOfWorkManage;
         private readonly IRecordService _recordService;
+        private readonly IMESDeviceConfigService _mesDeviceConfigService;
+        private readonly IMesLogService _mesLogService;
+        private readonly IMesUploadHelper _mesUploadHelper;
+        private readonly ISqlSugarClient _sqlSugarClient;
+        private readonly IOptionsMonitor<OutboundTimeConfigOptions> _outboundTimeOptions;
+        private readonly ILogger<TaskService> _logger;
 
         public IRepository<Dt_Task> Repository => BaseDal;
 
@@ -63,7 +61,13 @@
             ITask_HtyService task_HtyService,
             IStockInfo_HtyService stockInfo_HtyService,
             IUnitOfWorkManage unitOfWorkManage,
-            IRecordService recordService) : base(BaseDal)
+            IRecordService recordService,
+            IMESDeviceConfigService mesDeviceConfigService,
+            IMesLogService mesLogService,
+            IMesUploadHelper mesUploadHelper,
+            ISqlSugarClient sqlSugarClient,
+            IOptionsMonitor<OutboundTimeConfigOptions> outboundTimeOptions,
+            ILogger<TaskService> logger) : base(BaseDal)
         {
             _mapper = mapper;
             _stockInfoService = stockInfoService;
@@ -76,6 +80,12 @@
             _stockInfo_HtyService = stockInfo_HtyService;
             _unitOfWorkManage = unitOfWorkManage;
             _recordService = recordService;
+            _mesDeviceConfigService = mesDeviceConfigService;
+            _mesLogService = mesLogService;
+            _mesUploadHelper = mesUploadHelper;
+            _sqlSugarClient = sqlSugarClient;
+            _outboundTimeOptions = outboundTimeOptions;
+            _logger = logger;
         }
 
         /// <summary>
@@ -146,7 +156,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 +169,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 +190,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