From b7d4e91a76cd1e414f9314b5452f89748e829cee Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 11 三月 2026 11:33:02 +0800
Subject: [PATCH] 1

---
 Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 28564a1..54429f5 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -8,7 +8,8 @@
 using WIDESEA_Core;
 using WIDESEA_Core.BaseRepository;
 using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO;
+using WIDESEA_Core.Core;
+using WIDESEA_DTO.GradingMachine;
 using WIDESEA_DTO.Task;
 using WIDESEA_IBasicService;
 using WIDESEA_IStockService;
@@ -209,6 +210,7 @@
                     var r when r.Contains("CW") => DateTime.Now.AddHours(1),
                     _ => DateTime.Now
                 };
+                stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
 
                 location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
 
@@ -492,8 +494,8 @@
 
                 // 4. 鑾峰彇閰嶇疆鐨勭洰鏍囧湴鍧�鏄犲皠
                 var targetAddressMap = _configuration.GetSection("AutoOutboundTask:TargetAddresses")
-                    .Get<Dictionary<string, string>>()
-                    ?? new Dictionary<string, string>();
+                    .Get<Dictionary<string, List<string>>>()
+                    ?? new Dictionary<string, List<string>>();
 
                 // 5. 鎵归噺鍒涘缓浠诲姟
                 var taskList = new List<Dt_Task>();
@@ -517,7 +519,7 @@
                         TaskType = TaskTypeEnum.Outbound.GetHashCode(),
                         TaskStatus = TaskStatusEnum.New.GetHashCode(),
                         Grade = 1,
-                        TaskNum = 0,  // 浣跨敤 0 璁╂暟鎹簱鑷姩鐢熸垚浠诲姟鍙�
+                        TaskNum = await BaseDal.GetTaskNo(),
                         Creater = "system_auto"
                     };
                     taskList.Add(task);
@@ -538,7 +540,7 @@
                         {
                             var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
                             _httpClientHelper.Post<WebResponseContent>(
-                                "http://logistics-service/api/logistics/notifyoutbound",
+                                "http://localhost:9292/api/Task/ReceiveTask",
                                 JsonSerializer.Serialize(wmstaskDto));
                         }
                         catch (Exception ex)
@@ -564,7 +566,7 @@
         /// <summary>
         /// 鍫嗗灈鏈哄彇鏀捐揣瀹屾垚鍚庣墿娴侀�氱煡鍖栨垚鍒嗗鏌滃畬鎴愪俊鍙�
         /// </summary>
-        public async Task<WebResponseContent> InOrOutCompletedAsync(InputDto input)
+        public async Task<WebResponseContent> InOrOutCompletedAsync(GradingMachineInputDto input)
         {
             WebResponseContent content = new WebResponseContent();
             if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
@@ -579,7 +581,7 @@
                 {
                     var location = await _locationInfoService.GetLocationInfoAsync(input.LocationCode);
 
-                    OutPutDto outPutDto = new OutPutDto()
+                    OutputDto outPutDto = new OutputDto()
                     {
                         LocationCode = input.LocationCode,
                         PalletCode = input.PalletCode,
@@ -590,7 +592,7 @@
                 }
                 else
                 {
-                    OutPutDto outPutDto = new OutPutDto()
+                    OutputDto outPutDto = new OutputDto()
                     {
                         LocationCode = input.LocationCode,
                         PalletCode = input.PalletCode,
@@ -613,7 +615,7 @@
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public async Task<WebResponseContent> SendLocationStatusAsync(InputDto input)
+        public async Task<WebResponseContent> SendLocationStatusAsync(GradingMachineInputDto input)
         {
             WebResponseContent content = new WebResponseContent();
             if (string.IsNullOrWhiteSpace(input.LocationCode))
@@ -650,7 +652,7 @@
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public async Task<WebResponseContent> RequestOutboundAsync(InputDto input)
+        public async Task<WebResponseContent> RequestOutboundAsync(GradingMachineInputDto input)
         {
             WebResponseContent content = new WebResponseContent();
             if (string.IsNullOrWhiteSpace(input.LocationCode) || string.IsNullOrWhiteSpace(input.PalletCode))
@@ -709,7 +711,7 @@
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public async Task<WebResponseContent> GetPalletCodeCellAsync(InputDto input)
+        public async Task<WebResponseContent> GetPalletCodeCellAsync(GradingMachineInputDto input)
         {
             WebResponseContent content = new WebResponseContent();
             if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
@@ -723,7 +725,7 @@
                 {
                     return content.Error("鏈壘鍒板搴旂殑鎵樼洏");
                 }
-                var outPutDtos = stockInfo.Details.Select(x => new OutPutDto()
+                var outPutDtos = stockInfo.Details.Select(x => new OutputDto()
                 {
                     LocationCode = input.LocationCode,
                     PalletCode = input.PalletCode,

--
Gitblit v1.9.3