From fb031cfeb03cb20c95c78fcccf9ba93c5dd5d798 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期六, 18 五月 2024 20:38:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2109368..1e4be2e 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -125,6 +125,32 @@
int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
+ /**
+ * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿 鍙屼几+鍗曞弻浼� 鐓滄槦瀹氬埗
+ */
+ public static String getShallowLoc5(SlaveProperties slaveProperties, String deepLoc,Integer whsType) {
+ if (whsType==9){
+ int row = getRow(deepLoc);
+ int shallowRow;
+ if (row == 21) {
+ shallowRow = row + 1;
+ } else if (row == 24) {
+ shallowRow = row - 1;
+ } else if (row == 25) {
+ shallowRow = row;
+ } else if (row == 27) {
+ shallowRow = row - 1;
+ } else {
+ throw new RuntimeException(row + "涓嶆槸娣卞簱浣嶏紝绯荤粺绻佸繖");
+ }
+ return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
+ }else {
+ int row = getRow(deepLoc);
+ int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+ int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+ return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
+ }
+ }
/**
* 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
@@ -149,6 +175,40 @@
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+ }
+
+ /**
+ * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿 鍙屼几+鍗曞弻浼� 鐓滄槦瀹氬埗
+ */
+ public static String getDeepLoc5(SlaveProperties slaveProperties, String shallowLoc,Integer whsType) {
+ if (whsType==9){
+ int row = getRow(shallowLoc);
+ int targetRow;
+ if (row == 22) {
+ targetRow = row - 1;
+ } else if (row == 23) {
+ targetRow = row + 1;
+ } else if (row == 25) {
+ targetRow = row;
+ } else if (row == 26) {
+ targetRow = row + 1;
+ } else {
+ throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+ }
+ return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+ } else {
+ int row = getRow(shallowLoc);
+ int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+ int targetRow;
+ if (remainder == 2) {
+ targetRow = row - 1;
+ } else if (remainder == 3) {
+ targetRow = row + 1;
+ } else {
+ throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+ }
+ return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+ }
}
/**
@@ -240,22 +300,22 @@
return 0;
}
- public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
- if (whsType == 1 || whsType==3 || whsType==4) {
+ public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏� //鏄惁娣辨祬搴撲綅寮�鍏�
+ if (whsType == 1 || whsType==3 || whsType==4 || whsType == 9) {
return true;
}
return false;
}
public static boolean BooleanWhsTypeSta(Integer whsType) {
- if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4) {
+ if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4 || whsType == 9) {
return true;
}
return false;
}
public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
- if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4) && staDescId != 11 && staDescId != 111) {
+ if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4 || whsType == 9) && staDescId != 11 && staDescId != 111) {
return true;
}
return false;
@@ -290,6 +350,8 @@
return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠�
case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠�
+ case 9://鍓嶅弻浼� 鍚庡乏鍗曞彸鍙�(灏忓崟澶у弻) 鐓滄槦瀹氬埗
+ return LocNecessaryParametersDoubleExtension9(whsType, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
}
@@ -505,6 +567,33 @@
}
return necessaryParameters;
}
+ public static int[] LocNecessaryParametersDoubleExtension9(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(21)) {
+ necessaryParameters[1] = 25; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 7; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 25; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(25)) {
+ necessaryParameters[1] = 24; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 6; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 23; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(24)) {
+ necessaryParameters[1] = 27; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 7; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 26; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(27)) {
+ necessaryParameters[1] = 21; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 6; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 22; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ }
+ return necessaryParameters;
+ }
public static void main(String[] args) {
--
Gitblit v1.9.1