From f5c89a9b01b0cae70a7e0ccd878fb75121743929 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期三, 10 十二月 2025 13:18:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 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 6039033..7ea807e 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -208,6 +208,9 @@
*/
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
+ if (row==9 || row == 10){
+ return deepLoc;
+ }
boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);
boolean deepLocRight = isDeepLocRight(slaveProperties, row);
int targetRow;
@@ -234,6 +237,9 @@
*/
public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
int row = getRow(shallowLoc);
+ if (row==9 || row == 10){
+ return shallowLoc;
+ }
boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);
boolean deepLocRight = isDeepLocRight(slaveProperties, row+1);
int targetRow;
@@ -264,6 +270,9 @@
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
+ if (shallowRow==9 || shallowRow == 10){
+ return shallowRow;
+ }
boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);
boolean deepLocRight = isDeepLocRight(slaveProperties, shallowRow+1);
int targetRow;
@@ -357,6 +366,13 @@
return false;
}
+ public static boolean BooleanWhsTypeSta(Integer whsType) {
+ if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4 || whsType == 9) {
+ return true;
+ }
+ return false;
+ }
+
public static boolean BooleanWhsTypeSta(RowLastno rowLastno, Integer staDescId) {//绔欑偣璺緞鏇存柊
if (rowLastno.getPointSwitch().equals("Y") && staDescId != 11 && staDescId != 111) {
return true;
@@ -384,7 +400,8 @@
public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
switch (rowLastno.getTypeId()) {
case 1://缁忓吀鍙屼几搴撲綅
- return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension9(rowLastno, curRow, crnNumber); //宸插畬鍠�
+// return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
return LocNecessaryParametersDoubleExtension2(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 3://缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
@@ -397,11 +414,61 @@
return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 7://骞冲簱 CTU搴�
return LocNecessaryParametersDoubleExtension7(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ case 9://鍓嶅弻浼� 鍚庡乏鍗曞彸鍙�(灏忓崟澶у弻) 娓姇瀹氬埗
+ return LocNecessaryParametersDoubleExtension9(rowLastno, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
}
}
+ public static int[] LocNecessaryParametersDoubleExtension9(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+
+ Integer sRow = rowLastno.getsRow();
+ Integer sCrnNo = rowLastno.getsCrnNo();
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(14)) {
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(11)) {
+ necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(10)) {
+ necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 13; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(9)) {
+ necessaryParameters[1] = 11; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(8)) {
+ necessaryParameters[1] = 10; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 3; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 10; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(5)) {
+ necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 3; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 9; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(4)) {
+ necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 2; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(1)) {
+ necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 2; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ }
+
+ return necessaryParameters;
+ }
+
//缁忓吀鍙屼几搴撲綅
public static int[] LocNecessaryParametersDoubleExtension(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
--
Gitblit v1.9.1