From dff36af4872e3094cf646cd35b8277f79f21a2ed Mon Sep 17 00:00:00 2001 From: LSH Date: 星期四, 29 二月 2024 14:16:51 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 426 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 407 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index e80f7e5..d06f20b 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -2,7 +2,14 @@ import com.core.common.Arith; import com.core.common.Cools; +import com.core.common.SpringUtils; +import com.core.exception.CoolException; +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.system.service.UserService; import java.text.DecimalFormat; import java.util.ArrayList; @@ -15,22 +22,22 @@ private static final DecimalFormat fmt = new DecimalFormat("##0.00"); - public static float scale(Float f){ + public static float scale(Float f) { if (f == null || f == 0f || Float.isNaN(f)) { return 0f; } return (float) Arith.multiplys(2, f, 1); } - public static String zerofill(String msg, Integer count){ - if (msg.length() == count){ + public static String zerofill(String msg, Integer count) { + if (msg.length() == count) { return msg; - } else if (msg.length() > count){ + } else if (msg.length() > count) { return msg.substring(0, 16); } else { StringBuilder msgBuilder = new StringBuilder(msg); - for (int i = 0; i<count-msg.length(); i++){ - msgBuilder.insert(0,"0"); + for (int i = 0; i < count - msg.length(); i++) { + msgBuilder.insert(0, "0"); } return msgBuilder.toString(); } @@ -39,7 +46,7 @@ /** * 鍒ゆ柇鏄惁涓烘繁搴撲綅 */ - public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){ + public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo) { if (slaveProperties.isDoubleDeep()) { int row = getRow(locNo); return slaveProperties.getDoubleLocs().contains(row); @@ -51,7 +58,7 @@ /** * 鍒ゆ柇鏄惁涓烘繁搴撲綅 */ - public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){ + public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row) { if (slaveProperties.isDoubleDeep()) { return slaveProperties.getDoubleLocs().contains(row); } else { @@ -60,9 +67,32 @@ } /** + * 鍒ゆ柇鏄惁涓哄乏娣卞簱浣� + */ + public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row) { + if (slaveProperties.isDoubleDeep()) { + return slaveProperties.getDoubleLocsLeft().contains(row); + } else { + return false; + } + } + + + /** + * 鍒ゆ柇鏄惁涓哄彸娣卞簱浣� + */ + public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row) { + if (slaveProperties.isDoubleDeep()) { + return slaveProperties.getDoubleLocsRight().contains(row); + } else { + return false; + } + } + + /** * 鍒ゆ柇鏄惁涓烘祬搴撲綅 */ - public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){ + public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) { if (slaveProperties.isDoubleDeep()) { int row = getRow(locNo); return !slaveProperties.getDoubleLocs().contains(row); @@ -74,7 +104,7 @@ /** * 鍒ゆ柇鏄惁涓烘祬搴撲綅 */ - public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){ + public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) { if (slaveProperties.isDoubleDeep()) { return !slaveProperties.getDoubleLocs().contains(row); } else { @@ -144,6 +174,26 @@ } /** + * 閫氳繃搴撲綅鍙疯幏鍙� 鍒� + */ + public static int getBay(String locNo) { + if (!Cools.isEmpty(locNo)) { + return Integer.parseInt(locNo.substring(2, 5)); + } + throw new RuntimeException("搴撲綅瑙f瀽寮傚父"); + } + + /** + * 閫氳繃搴撲綅鍙疯幏鍙� 灞� + */ + public static int getLev(String locNo) { + if (!Cools.isEmpty(locNo)) { + return Integer.parseInt(locNo.substring(5, 7)); + } + throw new RuntimeException("搴撲綅瑙f瀽寮傚父"); + } + + /** * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣� */ public static void toDeepIfEmptyByShallow(String shallowLoc) { @@ -161,15 +211,353 @@ } - 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 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) { + switch (sourceStaNo){ + case 104: + case 173: + case 174: + case 175: + case 130: + case 125: + return 5; + case 204: + case 273: + case 274: + case 275: + case 230: + case 225: + return 2; + default: + return 0; + } } + + public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏� + if (whsType == 1) { + return true; + } + return false; + } + + public static boolean BooleanWhsTypeSta(Integer whsType) { + if (whsType == 1 || whsType == 2 || whsType == 5) { + return true; + } + return false; + } + + public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) { + if ((whsType == 1 || whsType == 5 || whsType == 2) && staDescId != 11 && staDescId != 111) { + return true; + } + return false; + } + + public static int RowCount(Integer whsType, Integer curRow, Integer crnNumber) { + return LocNecessaryParameters(whsType, curRow, crnNumber)[0]; + } + + public static int getCurRow(Integer whsType, Integer curRow, Integer crnNumber) { + return LocNecessaryParameters(whsType, curRow, crnNumber)[1]; + } + + 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[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) { + switch (whsType){ + case 1://缁忓吀鍙屼几搴撲綅 + return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠� + case 2://缁忓吀鍗曚几搴撲綅 + return LocNecessaryParametersDoubleExtension2(whsType, curRow, crnNumber); //宸插畬鍠� + case 3://缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻) + return LocNecessaryParametersDoubleExtension3(whsType, curRow, crnNumber); //鏈畬鍠� + case 4://缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟) + return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠� + case 5://鍙屽伐浣嶅崟浼稿簱浣� + return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //鏈畬鍠� + default: + return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo + } + } + + //缁忓吀鍙屼几搴撲綅 + public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, 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; // 杞娆℃暟 + //婊℃澘姝e父鍏ュ簱 + 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 * 4 - 3 + sRow - 1)) { + 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 - 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); + } + } + } + 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 int[] LocNecessaryParametersDoubleExtension2(Integer whsType, 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; // 杞娆℃暟 + //婊℃澘姝e父鍏ュ簱 + if (curRow.equals(crnNumber * 2 + sRow - 1)) { + necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓 + } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) { + 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 { + throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); + } + } + } + return necessaryParameters; + } + + //缁忓吀鍗曚几搴撲綅 + public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, 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; // 杞娆℃暟 + //婊℃澘姝e父鍏ュ簱 + if (curRow.equals(crnNumber * 2 + sRow - 1)) { + necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓 + } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) { + 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 { + throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); + } + } + } + return necessaryParameters; + } + + //缁忓吀鍗曚几搴撲綅 + public static int[] LocNecessaryParametersDoubleExtension4(Integer whsType, 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; // 杞娆℃暟 + //婊℃澘姝e父鍏ュ簱 + if (curRow.equals(crnNumber * 2 + sRow - 1)) { + necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓 + } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) { + 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 { + throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); + } + } + } + return necessaryParameters; + } + + //鍙屽伐浣嶅崟浼稿簱浣� + public static int[] LocNecessaryParametersDoubleExtension5(Integer whsType, 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; // 杞娆℃暟 + //婊℃澘姝e父鍏ュ簱 + 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 * 4 - 3 + sRow - 1)) { + 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 - 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); + } + } + } + return necessaryParameters; + } + + + public static void main(String[] args) { + List<LocMast> locS = new ArrayList<LocMast>(); + String locNo = "0000102"; + for (int i = 1; i < 16; i++) { + String s = zerofill(String.valueOf(i), 2) + locNo.substring(2); + LocMast locMast = new LocMast(); + locMast.setLocNo(s); + locS.add(locMast); + } + List<String> innermostSideLoc = getInnermostSideLoc(locS); + System.out.println(innermostSideLoc); + } + + //杞崲涓哄悇鑷搴旂殑娣卞簱浣� + public static List<String> getInnermostSideLoc(List<LocMast> locS) { + ArrayList<String> listLocRBL = new ArrayList<>(); + for (LocMast locMast : locS) { + String innermostSideLocRBL = Utils.getInnermostSideLocRBL(locMast.getLocNo()); + if (Cools.isEmpty(innermostSideLocRBL)) { + continue; + } + if (!listLocRBL.contains(innermostSideLocRBL)) { + listLocRBL.add(innermostSideLocRBL); + } + } + return listLocRBL; + } + + public static String getInnermostSideLocRBL(String locNo) { + int row = Utils.getRow(locNo); + if (row % 4 == 0 || (row + 3) % 4 == 0) { + return zerofill(String.valueOf(row), 2) + locNo.substring(2); + } else if ((row + 2) % 4 == 0) { + return zerofill(String.valueOf(row - 1), 2) + locNo.substring(2); + } else if ((row + 1) % 4 == 0) { + return zerofill(String.valueOf(row + 1), 2) + locNo.substring(2); + } + return null; + } + + public static String getInnermostSideLocLBR(String locNo) { + int row = Utils.getRow(locNo); + if (row % 4 == 0) { + return zerofill(String.valueOf(row - 1), 2) + locNo.substring(2); + } else if ((row + 3) % 4 == 0) { + return zerofill(String.valueOf(row + 1), 2) + locNo.substring(2); + } + return null; + } + } -- Gitblit v1.9.1