From fe2ac1e9580172bc3341553032fb2679e70fd42a Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 13 十二月 2024 10:46:40 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java index 3880962..23ba656 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; import java.util.Set; @Service("locDetlService") @@ -25,6 +26,13 @@ public Page<LocDetl> getStockOut(Page<LocDetl> page) { page.setRecords(baseMapper.getStockOutPage(page.getCondition())); page.setTotal(baseMapper.getStockOutPageCount(page.getCondition())); + return page; + } + + @Override + public Page<LocDetl> getStockStatis2(Page<LocDetl> page) { + page.setRecords(baseMapper.getStockStatis2(page.getCondition())); + page.setTotal(baseMapper.getStockStatisCount(page.getCondition())); return page; } @@ -46,6 +54,11 @@ @Override public List<String> getSameDetlToday(String matnr, Integer start, Integer end) { return this.baseMapper.selectSameDetlToday(matnr, start, end); + } + + @Override + public List<String> getSameDetlToday(String matnr,String batch, Integer start, Integer end) { + return this.baseMapper.selectSameDetlTodayBatch(matnr,batch, start, end); } @@ -121,4 +134,20 @@ public void updateMatTurn(String matnrOld,String matnr){ this.baseMapper.updateMatTurn(matnrOld,matnr); } + + @Override + public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) { + if (crnNo==1){ + return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapY(crnNo); + } + return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapN(crnNo); + } + + @Override + public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo) { + if (crnNo==1){ + return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr,batch,grade); + } + return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr,batch,grade); + } } -- Gitblit v1.9.1