From 7e8c672d13a4d5c9ef6d8b62f6fc1ce092a6c123 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期一, 11 八月 2025 08:23:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index c92d7e8..d5a8a1a 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -10,6 +10,7 @@
import com.zy.asrs.service.StaDescService;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service("staDescService")
@@ -17,24 +18,43 @@
@Override
public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo) {
- return this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo);
+ List<Integer> list = new ArrayList<>();
+ List<StaDesc> staDescs = this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo);
+ for (StaDesc staDesc : staDescs) {
+ if (list.contains(staDesc.getStnNo())) {
+ continue;
+ }
+ list.add(staDesc.getStnNo());
+ }
+ return list;
}
@Override
- public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
+ public List<StaDesc> queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
.eq("stn_no", stnNo)
.eq("crn_no", crnNo);
- StaDesc staDesc = this.selectOne(wrapper);
- if (staDesc == null) {
+ List<StaDesc> staDescs = this.selectList(wrapper);
+ if (staDescs.isEmpty()) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
- return staDesc;
+ return staDescs;
}
@Override
- public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) {
+ public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo, Integer row) {
+ if (crnNo == 1 && row > 3) {
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", typeNo)
+ .eq("stn_no", stnNo)
+ .eq("crn_no", crnNo)
+ .orderBy("stn_no", false);
+ StaDesc staDesc = this.selectOne(wrapper);
+ if (staDesc != null) {
+ return staDesc;
+ }
+ }
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
.eq("stn_no", stnNo)
@@ -54,4 +74,9 @@
return staDesc;
}
+ @Override
+ public StaDesc queryCrnStn(Integer crnNo) {
+ return this.baseMapper.queryCrnStn(crnNo);
+ }
+
}
--
Gitblit v1.9.1