From 7aa842ca0c3863da9024873cadd9fd64c72d26d2 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期二, 13 十二月 2022 08:48:54 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java index fe2fd1e..e1ba5cd 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -54,8 +54,13 @@ } @Override - public Boolean isOutMost(String locNo) { - return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo); + public Boolean isOutMost(String locNo, Boolean pakin) { + if (null == pakin) { + return (Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, true) + || Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, false)); + } else { + return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, pakin); + } } @Override @@ -72,4 +77,17 @@ return Boolean.FALSE; } + @Override + public Integer getOutCrnNo(LocMast locMast) { + int row = Utils.getRow(locMast.getLocNo()); + if (Utils.FIRST_GROUP_ROW_LIST.contains(row)) { + return 1; + } + if (Utils.SECOND_GROUP_ROW_LIST.contains(row)) { + return 3; + } else { + return locMast.getCrnNo(); + } + } + } -- Gitblit v1.9.1