From ec9c9add38591d7c7a2708ac43ed6b3fce1a4063 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 06 八月 2025 16:12:09 +0800
Subject: [PATCH] 1

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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 4045cd2..637c7ee 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"
@@ -156,6 +156,7 @@
                         29 => "鏀炬繁璐ф椂娴呰揣浣嶆湁璐�",
                         30 => "",
                         31 => "",
+                        _ => $"鏈煡鎶ヨ({alarm})"
                     };
                     object obj = new
                     {
@@ -216,6 +217,7 @@
         {
             if (commonStackerCrane != null)
             {
+                WriteInfo("鍫嗗灈鏈轰换鍔″畬鎴�", $"{commonStackerCrane.DeviceName}瀹屾垚浠诲姟鍙穥TaskNum}"); 
                 var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum);
                 if (task != null)
                 {
@@ -395,8 +397,8 @@
                     if (sourceCodes.Length == 3)
                     {
                         stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
-                        stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
-                        stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+                        stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+                        stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
                     }
                     else
                     {
@@ -409,8 +411,8 @@
                     if (targetCodes.Length == 3)
                     {
                         stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
-                        stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
-                        stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+                        stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+                        stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
                     }
                     else
                     {
@@ -435,8 +437,8 @@
                     if (sourceCodes.Length == 3)
                     {
                         stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
-                        stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
-                        stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+                        stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+                        stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
                     }
                     else
                     {
@@ -448,8 +450,8 @@
                     if (targetCodes.Length == 3)
                     {
                         stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
-                        stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
-                        stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+                        stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+                        stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
                     }
                     else
                     {
@@ -471,8 +473,8 @@
                 if (sourceCodes.Length == 3)
                 {
                     stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
-                    stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
-                    stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+                    stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+                    stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
                 }
                 else
                 {
@@ -484,8 +486,8 @@
                 if (targetCodes.Length == 3)
                 {
                     stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
-                    stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
-                    stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+                    stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+                    stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
                 }
                 else
                 {

--
Gitblit v1.9.3