From 1b43abdddc83ee73315a44481c4abd66ee545ca6 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期一, 20 十月 2025 08:32:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 512 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 278 insertions(+), 234 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..ac837db 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -8,15 +8,10 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.service.RowLastnoService;
-import com.zy.common.model.LocDetlDto;
import com.zy.common.properties.SlaveProperties;
-import com.zy.common.service.CommonService;
-import com.zy.system.service.UserService;
import java.text.DecimalFormat;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
/**
@@ -121,17 +116,12 @@
*/
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);
+ if (row ==1 || row == 6){
+ return deepLoc;
+ }
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
+ int shallowRow = deepLocLeft ? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
- }
-
- /**
- * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
- */
- public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
- int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
- return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
}
/**
@@ -139,32 +129,47 @@
*/
public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
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 + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row - 1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ int shallowRow = deepLocLeft ? (row - 1) : (row + 1);
+ return zerofill(String.valueOf(shallowRow), 2) + shallowLoc.substring(2);
+ }
+
+ /**
+ * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿,濡傛灉娌℃湁娣卞簱浣嶏紝鍒欒繑鍥炰负绌�
+ */
+ public static String getDeepLoc2(SlaveProperties slaveProperties, String shallowLoc) {
+ int row = getRow(shallowLoc);
+ boolean deepLoc = isDeepLoc(slaveProperties, row);//鍒ゆ柇鏄惁涓烘繁搴撲綅
+ if (deepLoc) {
+ return null;
}
- return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+ if (row == 1 || row == 6) {
+ return null;
+ }
+ //2,8,11,15,19,23
+ if (row == 5 || row == 8 || row == 12 || row == 16 || row == 20 || row == 24) {
+ return zerofill(String.valueOf(row - 1), 2) + shallowLoc.substring(2);
+ } else {
+ return zerofill(String.valueOf(row + 1), 2) + shallowLoc.substring(2);
+ }
+ }
+
+
+ /**
+ * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
+ */
+ public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
+// int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, deepRow);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
+ return deepLocLeft ? (deepRow + 1) : (deepRow - 1);
}
/**
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
- int targetRow;
- if (remainder == 2) {
- targetRow = shallowRow - 1;
- } else if (remainder == 3) {
- targetRow = shallowRow + 1;
- } else {
- throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
- }
- return targetRow;
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow - 1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ return deepLocLeft ? (shallowRow - 1) : (shallowRow + 1);
}
/**
@@ -215,24 +220,13 @@
}
-// public static void main(String[] args) {
-// SlaveProperties slaveProperties = new SlaveProperties();
-// slaveProperties.setDoubleDeep(true);
-// List<Integer> list = new ArrayList<>();
-// list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
-// slaveProperties.setDoubleLocs(list);
-// slaveProperties.setGroupCount(4);
-// Integer deepRow = getDeepRow(slaveProperties, 6);
-// System.out.println(deepRow);
-// }
-
public static Integer GetWhsType(Integer sourceStaNo) {
RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
List<RowLastno> rowLastnos = rowLastnoService.selectList(new EntityWrapper<RowLastno>());
- for (RowLastno rowLastno:rowLastnos){
+ for (RowLastno rowLastno : rowLastnos) {
String[] staNoList = rowLastno.getStaNoList().split(";");
- for (String staNo : staNoList){
- if (staNo.equals(sourceStaNo.toString())){
+ for (String staNo : staNoList) {
+ if (staNo.equals(sourceStaNo.toString())) {
return rowLastno.getWhsType();
}
}
@@ -240,269 +234,319 @@
return 0;
}
- public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
- if (whsType == 1 || whsType==3 || whsType==4) {
+ public static boolean BooleanWhsTypeStaIoType(RowLastno rowLastno) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
+ if (rowLastno.getBeSimilar().equals("Y")) {
return true;
}
return false;
}
- public static boolean BooleanWhsTypeSta(Integer whsType) {
- if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4) {
+ public static boolean BooleanWhsTypeSta(RowLastno rowLastno, Integer staDescId) {//绔欑偣璺緞鏇存柊
+ if (rowLastno.getPointSwitch().equals("Y") && staDescId != 11 && staDescId != 111) {
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) {
- return true;
- }
- return false;
+ public static int RowCount(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber)[0];
}
- public static int RowCount(Integer whsType, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(whsType, curRow, crnNumber)[0];
+ public static int getCurRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber)[1];
}
- public static int getCurRow(Integer whsType, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(whsType, curRow, crnNumber)[1];
+ public static int getCrnNo(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber)[2];
}
- public static int getCrnNo(Integer whsType, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(whsType, curRow, crnNumber)[2];
- }
-
- public static int getNearRow(Integer whsType, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(whsType, curRow, crnNumber)[3];
+ public static int getNearRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber)[3];
}
//搴撲綅鎺掑彿鍒嗛厤
- public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
- switch (whsType){
+ public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ switch (rowLastno.getTypeId()) {
case 1://缁忓吀鍙屼几搴撲綅
- return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
- return LocNecessaryParametersDoubleExtension2(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension2(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 3://缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
- return LocNecessaryParametersDoubleExtension3(whsType, curRow, crnNumber); //鏈畬鍠�
+ return LocNecessaryParametersDoubleExtension3(rowLastno, curRow, crnNumber); //鏈畬鍠�
case 4://缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
- return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠�
+ return LocNecessaryParametersDoubleExtension4(rowLastno, curRow, crnNumber); //鏈畬鍠�
case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
- return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension5(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ case 6://鍥涘悜搴�(鐗涚溂杞�)eg:鍏夋嘲鍥涘悜
+ return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ case 7://骞冲簱 CTU搴�
+ return LocNecessaryParametersDoubleExtension7(rowLastno, curRow, crnNumber); //宸插畬鍠�
default:
- return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
+ return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
}
}
//缁忓吀鍙屼几搴撲綅
- public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
+
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 4 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
- necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 4 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
+ necessaryParameters[1] = sRow + 3; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 4;
+ if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 3) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 4;
- if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
+
return necessaryParameters;
}
//缁忓吀鍙屼几搴撲綅绉诲簱
- public static int[] LocNecessaryParametersMove(Integer whsType, Integer curRow, Integer moveCrnNo) {
+ public static int[] LocNecessaryParametersMove(RowLastno rowLastno, 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 鏈�娣卞簱浣嶆帓
+ 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[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ necessaryParameters[1] = curRow - 2; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = moveCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
}
return necessaryParameters;
}
//缁忓吀鍗曚几搴撲綅
- public static int[] LocNecessaryParametersDoubleExtension2(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension2(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 2 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
- necessaryParameters[1] = sRow+1; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 2 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
+ necessaryParameters[1] = sRow + 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 2;
+ if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 2 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 2 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 2;
- if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 2 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 2 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
return necessaryParameters;
}
//缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
- public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension3(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 3 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
- necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 3 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
+ necessaryParameters[1] = sRow + 2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 3;
+ if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 3;
- if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 3 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 3 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1 ; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
+
return necessaryParameters;
}
//缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
- public static int[] LocNecessaryParametersDoubleExtension4(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension4(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- Integer sRow = rowLastno.getsRow();
- Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 3 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
- necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
+ Integer sRow = rowLastno.getsRow();//璧峰鎺掑彿
+ Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 3 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
+ necessaryParameters[1] = sRow + 2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 3;
+ if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 3;
- if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 3 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow + 1 ; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 3 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
+
return necessaryParameters;
}
//鍙屽伐浣嶅崟浼稿簱浣�
- public static int[] LocNecessaryParametersDoubleExtension5(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension5(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 4 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
- necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 4 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
+ necessaryParameters[1] = sRow + 3; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 4;
+ if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 4;
- if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
+
+ return necessaryParameters;
+ }
+
+ //鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
+ public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ Integer sRow = rowLastno.getsRow();//璧峰鎺掑彿
+ Integer offset = 4;//璧峰鎺掑彿
+ Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ curRow = curRow - offset;
+ //婊℃澘姝ｅ父鍏ュ簱
+ switch (curRow) {
+ case 1:
+ necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 4:
+ necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 9:
+ necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 14; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 14:
+ necessaryParameters[1] = 7; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 4; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 7:
+ necessaryParameters[1] = 12; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 9; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 12:
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ default:
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ necessaryParameters[1] = necessaryParameters[1] + offset;
+ necessaryParameters[3] = necessaryParameters[3] + offset;
+ return necessaryParameters;
+ }
+
+ //骞冲簱锛堝厜娉癨CTU锛�
+ public static int[] LocNecessaryParametersDoubleExtension7(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(rowLastno.geteRow())) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ necessaryParameters[1] = curRow + 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ }
+
return necessaryParameters;
}
@@ -566,14 +610,14 @@
* 鍑哄簱 false:pakin
* */
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupOutLocCrn(Integer curRow,Integer nearRow,String locNo,boolean pakin){
+ public static List<String> getGroupOutLocCrn(Integer curRow, Integer nearRow, String locNo, boolean pakin) {
List<String> result = new ArrayList<>();
- if (pakin){
- for (int row = curRow;row<=nearRow;row++){
+ if (pakin) {
+ for (int row = curRow; row >= nearRow; row--) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
- }else {
- for (int row = curRow;row>=curRow;row--){
+ } else {
+ for (int row = curRow; row <= nearRow; row++) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
}
--
Gitblit v1.9.1