From 50f2d8d80c3a73bb17c1d559e1c08d2e315d0add Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期日, 02 六月 2024 01:14:00 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 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 fd21de8..d39cf02 100644 --- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java @@ -38,7 +38,8 @@ if (row == 31 || row == 32) { crnNo = 3; } - return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo); + return this.baseMapper.queryOutStation(); + //return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo); } @Override @@ -57,13 +58,13 @@ public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) { Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", typeNo) - .eq("stn_no", stnNo) - .eq("crn_no", crnNo); + .eq("stn_no", stnNo); + //.eq("crn_no", crnNo); StaDesc staDesc = this.selectOne(wrapper); if (staDesc == null) { wrapper = new EntityWrapper<StaDesc>() - .eq("type_no", typeNo) - .eq("crn_no", crnNo); + .eq("type_no", typeNo); + //.eq("crn_no", crnNo); List<StaDesc> staDescs = this.selectList(wrapper); if (Cools.isEmpty(staDescs)) { throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�"); -- Gitblit v1.9.1