From ef7ff6f2da6051b0a0db3babd61a29ed69e3e228 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期三, 15 一月 2025 11:24:04 +0800
Subject: [PATCH] 增强API与状态管理,优化配置及文档

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 1864fd5..40ef704 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -100,7 +100,7 @@
                 WMSTaskDTO taskDTO = new WMSTaskDTO()
                 {
                     TaskNum = task.TaskNum.Value,
-                    Grade = 1,
+                    Grade = task.Grade.Value,
                     PalletCode = task.PalletCode,
                     RoadWay = task.Roadway,
                     SourceAddress = task.SourceAddress,
@@ -186,6 +186,29 @@
             // 缁勭洏淇℃伅
             // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
             var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+
+            if (!result.Success)
+            {
+                var taskNG = new Dt_Task
+                {
+                    CurrentAddress = input.Position,
+                    Grade = 1,
+                    Roadway = input.Roadways,
+                    TargetAddress = stationManager.stationNGLocation,
+                    Dispatchertime = DateTime.Now,
+                    MaterialNo = "",
+                    NextAddress = stationManager.stationNGChildCode,
+                    OrderNo = null,
+                    PalletCode = input.PalletCode,
+                    SourceAddress = stationManager.stationLocation,
+                    TaskState = (int)TaskInStatusEnum.Line_InFinish,
+                    TaskType = (int)TaskOutboundTypeEnum.InToOut,
+                    TaskNum = await BaseDal.GetTaskNo(),
+                    Creater = "Systeam"
+                };
+                return taskNG;
+            }
+
             if (result.SerialNos.Count <= 0)
             {
                 ConsoleHelper.WriteErrorLine(result.MOMMessage);
@@ -218,7 +241,7 @@
             }
 
             // 澶勭悊寮傚父鐢佃姱鎯呭喌
-            var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+            var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
             if (serialNosError.Count > 0)
             {
                 if (stationManager.stationType != 3)
@@ -509,7 +532,7 @@
             var task = new Dt_Task
             {
                 CurrentAddress = input.Position,
-                Grade = 1,
+                Grade = 2,
                 Roadway = input.Roadways,
                 TargetAddress = stationManager.stationLocation,
                 Dispatchertime = DateTime.Now,
@@ -836,7 +859,7 @@
 
                 var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
 
-                var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1");
+                var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1","10086");
 
                 if (stockInfo != null)
                 {

--
Gitblit v1.9.3