From b334b473f36f8565dd2b10515b797aa2a9c77a7c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 04 十一月 2023 08:11:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 4c80cd8..1f40a61 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -250,7 +250,12 @@
 
     //搴撲綅鎺掑彿鍒嗛厤
     public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
-        return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber);
+        switch (whsType){
+            case 1://缁忓吀鍙屼几搴撲綅
+                return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber);
+            default:
+                return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
+        }
     }
 
     //缁忓吀鍙屼几搴撲綅
@@ -288,6 +293,22 @@
         return necessaryParameters;
     }
 
+    //缁忓吀鍙屼几搴撲綅绉诲簱
+    public static int[] LocNecessaryParametersMove(Integer whsType, Integer curRow, Integer moveCrnNo) {
+        int[] necessaryParameters = new int[]{0, 0, 0, 0};
+        necessaryParameters[0] = 2; // 杞娆℃暟
+        if (curRow.equals(moveCrnNo*4-2)){
+            necessaryParameters[1] = curRow+2;    //curRow   鏈�娣卞簱浣嶆帓
+            necessaryParameters[2] = moveCrnNo;     //crnNo     鍫嗗灈鏈哄彿
+            necessaryParameters[3] = curRow+1;    //nearRow  鏈�娴呭簱浣嶆帓
+        }else {
+            necessaryParameters[1] = curRow-2;    //curRow   鏈�娣卞簱浣嶆帓
+            necessaryParameters[2] = moveCrnNo;     //crnNo     鍫嗗灈鏈哄彿
+            necessaryParameters[3] = curRow-1;    //nearRow  鏈�娴呭簱浣嶆帓
+        }
+        return necessaryParameters;
+    }
+
 
     public static void main(String[] args) {
         List<LocMast> locS = new ArrayList<LocMast>();

--
Gitblit v1.9.1