From 53ae8e478f6034579303c51bdf881ffa526c942c Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期六, 24 五月 2025 14:22:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/CrnController.java |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index c2d5639..4844ff3 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -385,12 +385,12 @@
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
         command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
         command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
-        command.setSourcePosZ(param.getSourceRow());     // 婧愬簱浣嶆帓
-        command.setSourcePosX(param.getSourceBay());     // 婧愬簱浣嶅垪
-        command.setSourcePosY(param.getSourceLev());     // 婧愬簱浣嶅眰
-        command.setDestinationPosZ(param.getRow());     // 鐩爣搴撲綅鎺�
-        command.setDestinationPosX(param.getBay());     // 鐩爣搴撲綅鍒�
-        command.setDestinationPosY(param.getLev());     // 鐩爣搴撲綅灞�
+        command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
+        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
+        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
+        command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
         command.setCommand((short)1);
         return crnControl(command)?R.ok():R.error();
     }
@@ -406,13 +406,14 @@
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
         command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
-        command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
-        command.setSourcePosZ(param.getSourceRow());     // 婧愬簱浣嶆帓
-        command.setSourcePosX(param.getSourceBay());     // 婧愬簱浣嶅垪
-        command.setSourcePosY(param.getSourceLev());     // 婧愬簱浣嶅眰
-        command.setDestinationPosZ(param.getRow());     // 鐩爣搴撲綅鎺�
-        command.setDestinationPosX(param.getBay());     // 鐩爣搴撲綅鍒�
-        command.setDestinationPosY(param.getLev());     // 鐩爣搴撲綅灞�
+        command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+        command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
+        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
+        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
+        command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        command.setCommand((short)1);
         return crnControl(command)?R.ok():R.error();
     }
 
@@ -542,6 +543,7 @@
         command.setDestinationPosX((short) 0);     // 鐩爣搴撲綅鎺�
         command.setDestinationPosY((short) 0);     // 鐩爣搴撲綅鍒�
         command.setDestinationPosZ((short) 0);     // 鐩爣搴撲綅灞�
+        command.setCommand((short)0);
         return crnControl(command)?R.ok():R.error();
     }
 

--
Gitblit v1.9.1