From 3909c3583e8fc2057715ca20ac16b14072f32b14 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期四, 28 九月 2023 08:46:56 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 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 1c4a6cd..6ba3fab 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -55,12 +55,7 @@ @Override 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); - } + return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, pakin); } @Override @@ -70,11 +65,35 @@ @Override public Boolean isShuttle(String locNo) { - int row = Utils.getRow(locNo); - if (row >= 2 && row <= 30) { - return Boolean.TRUE; - } - return Boolean.FALSE; +// int row = Utils.getRow(locNo); +// if (row >= 2 && row <= 30) { +// return Boolean.TRUE; +// } + return Boolean.TRUE; } + @Override + public Integer getOutCrnNo(LocMast locMast) { + return 1; + } + + @Override + public LocMast queryByLoc(String locNo) { + return this.baseMapper.queryByLoc(locNo); + } + + @Override + public LocMast queryByQrCode(String qrCodeValue) { + return this.baseMapper.queryByQrCode(qrCodeValue); + } + + @Override + public List<LocMast> selectLocByLev(Integer lev) { + return this.baseMapper.selectLocByLev(lev); + } + + @Override + public List<LocMast> selectEmptyLocNos(List<String> locNos) { + return this.baseMapper.selectEmptyLocNos(locNos); + } } -- Gitblit v1.9.1