From 497d1f54675810ff6fbc52018213dfd7e12cd16d Mon Sep 17 00:00:00 2001 From: LSH Date: 星期一, 04 三月 2024 16:18:13 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index 1f40a61..5e948f3 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -218,15 +218,22 @@ // System.out.println(deepRow); // } + public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏� + if (whsType == 1 || whsType==3 || whsType==4) { + return true; + } + return false; + } + public static boolean BooleanWhsTypeSta(Integer whsType) { - if (whsType == 1) { + if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4) { return true; } return false; } public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) { - if (whsType == 1 && staDescId != 11 && staDescId != 111) { + if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4) && staDescId != 11 && staDescId != 111) { return true; } return false; @@ -360,4 +367,48 @@ return null; } + + 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; + } + } + + /* + * 鏈�娣卞簱浣嶆帓鍙� 锛� 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