From 9f225bb1f1e26d25c1652d3e1ec2a8f239f69615 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 18 三月 2025 10:41:29 +0800
Subject: [PATCH] 1

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
index c1d4169..34261ee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
@@ -42,9 +42,31 @@
                         {
                             ConveyorLineInFinish(conveyorLine, command, childDeviceCode);
                         }
+                        //else if (childDeviceCode == "1005" && command.Status == (ushort)ConveyorStatus.Stored)
+                        //{
+                        //    Dt_Task task = _taskService.QueryConveyorLineTaskNum(conveyorLine.DeviceCode, childDeviceCode, command.TaskNum);
+                        //    if (task != null)
+                        //    {
+                        //        task.TaskState = TaskOutStatusEnum.Line_OutExecuting.ObjToInt();
+                        //        _taskService.UpdateData(task);
+                        //        ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(task);
+                        //        taskCommand.WriterTrue = (short)command.inRead;
+                        //        conveyorLine.SendCommand(taskCommand, childDeviceCode);
+                        //    }
+                        //}
                         else if (childDeviceCode == "1008" && command.Status == (ushort)ConveyorStatus.Stored)
                         {
-                            ConveyorLineOutFinish(conveyorLine, command, childDeviceCode);
+                            Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
+                            if (task != null)
+                            {
+                                List<Dt_Router> routers = _routerRepository.QueryData(x => x.StartPosi == task.NextAddress && x.ChildPosiDeviceCode == "AGV" && x.Remark == "鏈崰鐢�");
+                                if (routers.Count > 0)
+                                {
+
+                                }
+                                task.TaskState = TaskOutStatusEnum.Line_OutFinish.ObjToInt();
+                                _taskService.UpdateData(task);
+                            }
                         }
                     }
                     #region MyRegion

--
Gitblit v1.9.3