From dd7e8e19cf99d0dc85b64b10c192cf3e4c3dafc9 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 08 十二月 2023 13:22:49 +0800
Subject: [PATCH] # 显示器
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 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 14399e8..e0b8feb 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -8,6 +8,7 @@
import com.zy.asrs.utils.Utils;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service("locMastService")
@@ -55,12 +56,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,20 +66,43 @@
@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) {
- 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();
- }
+ 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);
+ }
+
+ @Override
+ public List<LocMast> selectNotEmptyLocNos(List<String> locNos) {
+ if (locNos.isEmpty()) {
+ return new ArrayList<LocMast>();
+ }
+ return this.baseMapper.selectNotEmptyLocNos(locNos);
+ }
}
--
Gitblit v1.9.1