From d59b540dd78d49ddf1f2e1c6dfb7b19a7d3e3d7c Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期日, 19 一月 2025 11:19:24 +0800
Subject: [PATCH] 优化代码结构和错误处理

---
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 1f85a2b..ca89b74 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -61,7 +61,7 @@
                 case 9:
                 case 11:
                 case 12:
-                    var task = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode);
+                    var task = _taskService.QueryExecutingTaskByBarcode(command.ConveyorLineBarcode, childDeviceCode);
                     if (task != null)
                     {
                         ExecuteStationAction(stationManager, conveyorLine, command, childDeviceCode);
@@ -238,6 +238,29 @@
         {
             if (command.ConveyorLineBarcode != "NoRead")
             {
+                //var config = _sys_ConfigService.GetByConfigKey("SYS_BASE", "ISFRINTRAY");
+                //if (config.ConfigValue == "1")
+                //{
+                //    Random random = new Random();
+                //    var task = new Dt_Task()
+                //    {
+                //        CurrentAddress = childDeviceCode,
+                //        Grade = 1,
+                //        NextAddress = "2066",
+                //        PalletCode = command.ConveyorLineBarcode,
+                //        Roadway = "FR",
+                //        SourceAddress = childDeviceCode,
+                //        TargetAddress = "2066",
+                //        TaskNum = random.Next(1,9999),
+                //        TaskType = (int)TaskInboundTypeEnum.InTray,
+                //        TaskState = (int)TaskInStatusEnum.Line_InExecuting,
+                //        WMSId = 0
+                //    };
+                //    var taskCommand = MapTaskCommand(task, command);
+                //    conveyorLine.SendCommand(taskCommand, childDeviceCode);
+                //}
+                //else
+                //{
                 var taskDTO = CreateEmptyTrayTaskDto(command.ConveyorLineBarcode, childDeviceCode);
 
                 if (_taskRepository.QueryFirst(x => x.PalletCode == taskDTO.PalletCode) != null)
@@ -258,6 +281,7 @@
                         _taskService.UpdateTaskStatusToNext(task);
                     }
                 }
+                //}
             }
         }
 
@@ -369,10 +393,10 @@
             }
 
 
-            if( conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode).ObjToInt() ==  0) //鎵樼洏姝e弽淇″彿
+            if (conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode).ObjToInt() == 0) //鎵樼洏姝e弽淇″彿
             {
 
-            }; 
+            };
 
             conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode);  //鎵樼洏鏈夋棤鐢佃姱淇″彿
 

--
Gitblit v1.9.3