From 1053f15fecff14e486b734d83426fe6f26f9b7cf Mon Sep 17 00:00:00 2001 From: lsh <lsh> Date: 星期一, 20 五月 2024 16:21:44 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 211 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 160 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index d06f20b..1e4be2e 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -1,5 +1,6 @@ package com.zy.asrs.utils; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Arith; import com.core.common.Cools; import com.core.common.SpringUtils; @@ -9,10 +10,13 @@ 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,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); + } + } /** * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺� @@ -145,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); + } } /** @@ -223,42 +287,35 @@ // } 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; + RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class); + List<RowLastno> rowLastnos = rowLastnoService.selectList(new EntityWrapper<RowLastno>()); + for (RowLastno rowLastno:rowLastnos){ + String[] staNoList = rowLastno.getStaNoList().split(";"); + for (String staNo : staNoList){ + if (staNo.equals(sourceStaNo.toString())){ + return rowLastno.getWhsType(); + } + } } + return 0; } - public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏� - if (whsType == 1) { + 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) { + 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) && 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; @@ -285,14 +342,16 @@ switch (whsType){ case 1://缁忓吀鍙屼几搴撲綅 return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠� - case 2://缁忓吀鍗曚几搴撲綅 + case 2://缁忓吀鍗曚几搴撲綅锛�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); //鏈畬鍠� + case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�) + return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠� + case 9://鍓嶅弻浼� 鍚庡乏鍗曞彸鍙�(灏忓崟澶у弻) 鐓滄槦瀹氬埗 + return LocNecessaryParametersDoubleExtension9(whsType, curRow, crnNumber); //宸插畬鍠� default: return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo } @@ -312,7 +371,7 @@ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓 - } else if (curRow.equals(crnNumber * 4 - 3 + sRow - 1)) { + } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) { necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓 @@ -367,7 +426,7 @@ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓 - } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) { + } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) { necessaryParameters[1] = sRow+1; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓 @@ -392,7 +451,7 @@ 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); @@ -402,27 +461,27 @@ if (BooleanWhsTypeSta(whsType)) { necessaryParameters[0] = crnNumber; // 杞娆℃暟 //婊℃澘姝e父鍏ュ簱 - if (curRow.equals(crnNumber * 2 + sRow - 1)) { + if (curRow.equals(crnNumber * 3 + 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 鏈�娣卞簱浣嶆帓 + } 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 + 2; - if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) { + curRow = curRow + 3; + if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) { throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); } - if ((curRow - sRow) % 2 == 0) { + if ((curRow - sRow) % 3 == 0) { necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓 - necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓 - } else if ((curRow - sRow + 1) % 2 == 0) { + } else if ((curRow - sRow + 1) % 3 == 0) { necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓 - necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓 + necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = curRow-1 ; //nearRow 鏈�娴呭簱浣嶆帓 } else { throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); } @@ -431,7 +490,7 @@ 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); @@ -441,26 +500,26 @@ if (BooleanWhsTypeSta(whsType)) { necessaryParameters[0] = crnNumber; // 杞娆℃暟 //婊℃澘姝e父鍏ュ簱 - if (curRow.equals(crnNumber * 2 + sRow - 1)) { + if (curRow.equals(crnNumber * 3 + 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 if (curRow.equals((crnNumber - 1) * 3 + sRow)) { + necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓 } else { - curRow = curRow + 2; - if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) { + curRow = curRow + 3; + if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) { throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); } - if ((curRow - sRow) % 2 == 0) { + if ((curRow - sRow) % 3 == 0) { necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓 - necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓 - } else if ((curRow - sRow + 1) % 2 == 0) { + 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 - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓 } else { throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); @@ -484,7 +543,7 @@ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓 - } else if (curRow.equals(crnNumber * 4 - 3 + sRow - 1)) { + } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) { necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓 @@ -504,6 +563,33 @@ } else { throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); } + } + } + 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; // 杞娆℃暟 + //婊℃澘姝e父鍏ュ簱 + 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; @@ -560,4 +646,27 @@ return null; } + + /* + * 鏈�娣卞簱浣嶆帓鍙� 锛� curRow + * 鏈�娴呭簱浣嶆帓鍙� 锛� nearRow + * 鏈�娴呭簱浣嶅彿锛岀敤浜庨攣瀹氬垪銆佸眰 锛� nearRow + * 鍏ュ簱 true:pakin + * 鍑哄簱 false: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++){ + result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2)); + } + }else { + for (int row = curRow;row>=curRow;row--){ + result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2)); + } + } + return result; + } + } -- Gitblit v1.9.1