From 7195016afc472307e4db0b415e45c9d4275bdb02 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 30 十月 2025 17:27:32 +0800
Subject: [PATCH] 1

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 06af2dd..86e7aae 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -9,6 +9,7 @@
 using WIDESEAWCS_BasicInfoRepository;
 using WIDESEAWCS_Common;
 using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_Communicator;
 using WIDESEAWCS_Core;
 using WIDESEAWCS_Core.Caches;
 using WIDESEAWCS_Core.Helper;
@@ -87,6 +88,7 @@
                                     bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
                                     if (sendFlag)
                                     {
+                                        var isWorkType = commonStackerCrane.Communicator.WriteNoRead("DB100.18.0", Convert.ToInt16(1));
                                         commonStackerCrane.LastTaskType = task.TaskType;
                                         _taskService.UpdateTaskStatusToNext(task.TaskNum);
                                         Thread.Sleep(1000);
@@ -237,7 +239,11 @@
                     ConsoleHelper.WriteColorLine(str, ConsoleColor.Blue);
                     var task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
 
-                    if (task == null) commonStackerCrane.SetValue(StackerCraneDBName.FinishConfirm, 1);
+                    if (task == null)
+                    {
+                        commonStackerCrane.SetValue(StackerCraneDBName.FinishConfirm, 1);
+                        return;
+                    }
                     string WorkStatus = $"銆恵commonStackerCrane.StackerCraneWorkStatusValue}銆�";
                     bool IsWrite = false;
                     var content = _taskService.StackCraneTaskCompleted(e.TaskNum);
@@ -251,24 +257,22 @@
                             var structs = BitConverter.GetBytes(InteractiveSignal).Reverse().ToArray().ToBoolArray();
                             if (structs[0])
                             {
-                                IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", 0);
+                                IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", Convert.ToInt32(0));
                                 Thread.Sleep(1000);
-                                IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", 9999);
+                                IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", Convert.ToInt32(9999));
+                                conveyorLine.Communicator.WriteNoRead("DB100.4", Convert.ToInt16(task.TaskNum));
                                 if (!IsWrite)
                                 {
                                     return;
                                 }
                             }
                         }
-                        var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress);
-                        if (station != null)
-                        {
-                            _taskService.SendAgvTask(station.stationRemark, task.TaskNum);
-                            _taskService.UpdateTaskStatusToNext(task.TaskNum);
-                        }
+
+                        _taskService.UpdateTaskStatusToNext(task.TaskNum);
                     }
 
-                    var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.FinishConfirm, 1);
+                    //var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.FinishConfirm, 1);
+                    var isWorkType = commonStackerCrane.Communicator.WriteNoRead("DB100.0", Convert.ToInt16(1));
 
 
                     str = $"{commonStackerCrane.DeviceName}銆慦MS|WCS浠诲姟瀹屾垚锛氥�恵content.Status}{content.Message}銆�,鍫嗗灈鏈哄畬鎴愪俊鍙峰啓鍏ワ細銆恵isWorkType}銆�,浠诲姟鍙凤細銆恵e.TaskNum}銆戞椂闂淬�恵DateTime.Now}銆戣緭閫佺嚎鍐欏叆{IsWrite}";
@@ -481,7 +485,6 @@
 
             stackerCraneTaskCommand.TaskNum = Convert.ToInt16(task.TaskNum);
             stackerCraneTaskCommand.WorkType = Convert.ToInt16(1);
-            stackerCraneTaskCommand.StartCommand = Convert.ToInt16(1);
             if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
             {
                 var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.stationChildCode == task.CurrentAddress);

--
Gitblit v1.9.3