From f72b0dc0ae80fee81a7a678deb0e3d97f89a0e1b Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 21 八月 2024 09:23:46 +0800 Subject: [PATCH] #优化 --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 7 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 7004ae0..ec31817 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -86,6 +86,22 @@ } return res; } + @Override + public Boolean checkEmptyCount0(LocMast locMast, int quaOfBlank) { + if (locMast == null) { + return false; + } + Integer nowQua = 0; + nowQua = this.baseMapper.selectEmptyLocCount0(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo()); + if (Cools.isEmpty(nowQua)) { + nowQua = 0; + } + boolean res = nowQua > quaOfBlank; + if (!res) { + log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua); + } + return res; + } @Override public Boolean checkWhole(List<LocDetl> locDetls) { @@ -205,22 +221,48 @@ } @Override - public LocMast findOutMast(Short locType1, List<Integer> crnNos) { + public List<LocMast> findOutMast(Short locType1, List<Integer> crnNos) { + if (crnNos.size() == 0) { + return null; + } return this.baseMapper.findOutMast(locType1, crnNos); } @Override - public LocMast findInEmptyLocMast(Short locType1, List<Integer> rows) { - return this.baseMapper.findInEmptyLocMast(locType1, rows); + public List<LocMast> findInEmptyLocMast(Short locType1, List<Integer> rows, Integer crnNo) { + return this.baseMapper.findInEmptyLocMast(locType1, rows, crnNo); } @Override - public LocMast findEmptyLocMastByLocNos(Short locType1, List<String> locNos) { - return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos); + public List<LocMast> findInEmptyLocMastNew(Short locType1, List<String> locNos, Integer crnNo) { + return this.baseMapper.findInEmptyLocMastNew(locType1, locNos, crnNo); } @Override - public LocMast findEmptyLowFrequencyLocMast(Short locType1) { - return this.baseMapper.findEmptyLowFrequencyLocMast(locType1); + public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo) { + return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos, crnNo); + } + + @Override + public List<LocMast> findEmptyLowFrequencyLocMast(Short locType1, Integer crnNo) { + return this.baseMapper.findEmptyLowFrequencyLocMast(locType1, crnNo); + } + + @Override + public List<LocMast> findEmptyLocMast(Short locType1, Integer crnNo) { + return this.baseMapper.findEmptyLocMast(locType1, crnNo); + } + + @Override + public List<LocMast> selectLocByLev(Integer lev) { + return this.baseMapper.selectLocByLev(lev); + } + + @Override + public List<LocMast> selectByLocNos(List<String> locNos) { + if (locNos == null || locNos.size() == 0) { + return new ArrayList<LocMast>(); + } + return this.baseMapper.selectByLocNos(locNos); } } -- Gitblit v1.9.1