From 49dfa451ed700fe0d845be9f36d2b4302aff92be Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 17:57:16 +0800
Subject: [PATCH] qw
---
src/main/java/com/zy/asrs/utils/Utils.java | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index f4306d5..3af7671 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -146,7 +146,7 @@
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+ int shallowRow = remainder == 1 ? (row - 1) : (row + 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -165,10 +165,10 @@
int row = getRow(shallowLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 0 ) {
- targetRow = row + 1;
- } else if (remainder == 3) {
+ if (remainder == 2) {
targetRow = row - 1;
+ } else if (remainder == 3) {
+ targetRow = row + 1;
} else {
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
@@ -356,9 +356,6 @@
}
}
- //鍫嗗灈鏈哄簱浣嶄粠14鎺掑紑濮�
- necessaryParameters[1] = necessaryParameters[1]+13; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[3] = necessaryParameters[3]+13; //nearRow 鏈�娴呭簱浣嶆帓
return necessaryParameters;
}
@@ -531,25 +528,20 @@
//婊℃澘姝ｅ父鍏ュ簱
switch (curRow){
case 1:
- necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 4:
- necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 5:
- necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 8:
necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 1; //nearRow 鏈�娴呭簱浣嶆帓
break;
+ case 6:
+ necessaryParameters[1] = 3; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 13:
+ necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
default:
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
--
Gitblit v1.9.1