From a7223a5dfc7c83c7fe3894e65d1fed84cae61a8e Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期三, 15 二月 2023 08:45:38 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 23 +++++++++++++++++++++-- 1 files changed, 21 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 8e06fd9..0a51a73 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,27 @@ } @Override - public Boolean isOutMost(String locNo) { - return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo); + public Boolean isOutMost(String locNo, Boolean pakin) { + return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, pakin); + } + + @Override + public List<String> getDemoNextLoc(Integer crnNo) { + return this.baseMapper.getDemoNextLoc(crnNo); + } + + @Override + public Boolean isShuttle(String locNo) { +// int row = Utils.getRow(locNo); +// if (row >= 2 && row <= 30) { +// return Boolean.TRUE; +// } + return Boolean.TRUE; + } + + @Override + public Integer getOutCrnNo(LocMast locMast) { + return 1; } } -- Gitblit v1.9.1