From 1b8cce65d4987e4b7e94d1b178abb3af0978a2d4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期三, 26 三月 2025 09:24:26 +0800
Subject: [PATCH] 123123

---
 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 37500aa..1a6ce89 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -1,4 +1,5 @@
 锘縰sing Masuit.Tools;
+using Masuit.Tools.Systems;
 using Newtonsoft.Json;
 using System.Threading.Tasks;
 using WIDESEAWCS_Common;
@@ -220,6 +221,7 @@
         {
             if (command.ConveyorLineBarcode != "NoRead")
             {
+                #region
                 //var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                 //var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.MOMIP_BASE)?.ConfigValue;
                 //var ipAddress = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.TrayCellsStatus)?.ConfigValue;
@@ -227,7 +229,7 @@
                 //{
                 //    throw new InvalidOperationException("MOM IP 鏈厤缃�");
                 //}
-                //var stationManager=_stationManagerRepository.QueryFirst(x=>x.stationChildCode == childDeviceCode);
+                //var stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode);
                 //TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
                 //{
                 //    Software = "WMS",
@@ -264,9 +266,18 @@
                 //                    if (device != null)
                 //                    {
                 //                        CommonConveyorLine_After CommonConveyorLine_After = (CommonConveyorLine_After)device;
-                //                        ConveyorLineTaskCommand_After conveyorLineAfter = CommonConveyorLine_After.ReadCustomer<ConveyorLineTaskCommand_After>((Convert.ToInt32(station.stationChildCode)).ToString());
+
+                //                        ConveyorLineTaskCommand_After taskCommand = new ConveyorLineTaskCommand_After()
+                //                        {
+                //                            ConveyorLineTaskNum = Convert.ToInt32(1),
+                //                            ConveyorLineTargetAddress = Convert.ToInt16(2234),
+                //                            ConveyorLineBarcode = command.ConveyorLineBarcode.ToString(),
+                //                        };
+                //                        CommonConveyorLine_After.SendCommand(taskCommand, station.stationChildCode);
+                //                        CommonConveyorLine_After.SetValue(ConveyorLineDBName_After.ResponState, 1, station.stationChildCode);
                 //                    }
                 //                    //鍙戦�佸埌鍒嗗
+                //                    return;
                 //                }
                 //            }
                 //        }
@@ -284,9 +295,10 @@
                 //                if (device != null)
                 //                {
                 //                    CommonConveyorLine_After CommonConveyorLine_After = (CommonConveyorLine_After)device;
-                //                    ConveyorLineTaskCommand_After conveyorLineAfter = CommonConveyorLine_After.ReadCustomer<ConveyorLineTaskCommand_After>((Convert.ToInt32(station.stationChildCode)).ToString());
-                //                    if (conveyorLineAfter.HasPallet == 0)
+                //                    ConveyorLineTaskCommand_After conveyorLineAfter = CommonConveyorLine_After.ReadCustomer<ConveyorLineTaskCommand_After>(Convert.ToInt32(station.stationChildCode).ToString());
+                //                    if (conveyorLineAfter.InteractiveSignal == 16)
                 //                    {
+                //                        var TaskNum = SnowFlake.LongId;
                 //                        Dt_Task task = new Dt_Task()
                 //                        {
                 //                            TaskNum = _taskRepository.GetTaskNo().Result,
@@ -295,7 +307,7 @@
                 //                            Roadway = station.Roadway,
                 //                            SourceAddress = childDeviceCode,
                 //                            TargetAddress = station.stationChildCode,
-                //                            CurrentAddress = station.stationChildCode,
+                //                            CurrentAddress = childDeviceCode,
                 //                            NextAddress = station.stationChildCode,
                 //                            TaskState = (int)TaskInStatusEnum.InNew,
                 //                            ExceptionMessage = "",
@@ -340,7 +352,7 @@
                 //{
                 //    ConsoleHelper.WriteErrorLine(result1.MOMMessage);
                 //}
-
+                #endregion
 
                 if (_taskRepository.QueryFirst(x => x.PalletCode == command.ConveyorLineBarcode) != null)
                 {
@@ -360,7 +372,7 @@
                     {
                         var taskCommand = MapTaskCommand(task, command);
                         conveyorLine.SendCommand(taskCommand, childDeviceCode);
-                        //conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
+                        conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
                         _taskService.UpdateTaskStatusToNext(task);
                     }
                 }

--
Gitblit v1.9.3