From 3d083e6b0799a075481323a57a67e6a9f6c56ed7 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期五, 23 八月 2024 10:17:44 +0800 Subject: [PATCH] 12 --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 53 insertions(+), 5 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 260df2a..8077398 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; -import com.core.exception.CoolException; +import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; import com.zy.asrs.mapper.LocMastMapper; import com.zy.asrs.service.LocMastService; @@ -19,19 +19,67 @@ private RowLastnoService rowLastnoService; @Override - public LocMast queryFreeLocMast(Integer row) { - return this.baseMapper.queryFreeLocMast(row); + public LocMast queryFreeLocMast(Integer row, Short locType1) { + return this.baseMapper.queryFreeLocMast(row, locType1); } @Override public List<String> queryGroupEmptyStock(String sourceLocNo) { if (Cools.isEmpty(sourceLocNo)) { - throw new CoolException("婧愬簱浣嶄笉鑳戒负绌�"); + return null; } LocMast sourceStock = this.selectById(sourceLocNo); if (Cools.isEmpty(sourceStock)) { - throw new CoolException("婧愬簱浣嶄笉瀛樺湪"); + return null; } return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo()); } + + @Override + public Boolean checkEmptyCount(LocMast locMast) { + if (locMast == null) { + return false; + } + return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1; + } + + /* + *鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� + * */ + @Override + public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) { + if (curRow<nearRow){ + return this.baseMapper.selectLocByLocStsPakInF1(locNos); + } + return this.baseMapper.selectLocByLocStsPakInF2(locNos); + } + + /* + * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 + * */ + @Override + public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) { + if (curRow<nearRow){ + return this.baseMapper.selectLocByLocStsPakInO1(locNos); + } + return this.baseMapper.selectLocByLocStsPakInO2(locNos); + } + + @Override + public Boolean checkWhole(List<LocDetl> locDetls) { + return null; + } + + @Override + public List<LocMast> queryShallowLocFMast(Integer crnNo) { + return this.baseMapper.queryShallowLocFMast(crnNo); + } + + @Override + public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo) { + if (crnNo==1){ + return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev); + } + return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev); + } } -- Gitblit v1.9.1