From d17a7346759fbb432cea1c83de63d29c6a3d330d Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期五, 24 五月 2024 10:14:06 +0800 Subject: [PATCH] # 自动回流取消任务更改源库位为D --- src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java index 65121a2..2a2b8f0 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java @@ -93,7 +93,7 @@ //褰撳墠搴撲綅鎵�澶勬ゼ灞� int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]); //locDto.setAgvStaNos(queryAgvStaNosByFloor(floor)); - locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1())); + locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),floor)); locDtoList.add(locDto); issued -= anfme; @@ -117,9 +117,19 @@ return page; } + @Override + public Double getSumAnfme(String matnr, String threeCode) { + return this.baseMapper.selectSumAnfmeByMatnr(matnr, threeCode); + } + + @Override + public Double getSumAnfmeDb(String matnr, String threeCode,Integer floor) { + return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor); + } + /* - 鑾峰彇搴撳瓨鎬绘暟 - */ + 鑾峰彇搴撳瓨鎬绘暟 + */ public Integer sum() { return this.baseMapper.sum(); } @@ -240,16 +250,21 @@ Row row = sheet.getRow(i); // 搴撲綅鍙� String locNo = dataFormatter.formatCellValue(row.getCell(0)); - // 瀹瑰櫒鐮� + // 璐ф灦鐮� String containerCode = dataFormatter.formatCellValue(row.getCell(1)); List<AgvLocDetl> agvLocDetls = this.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("supp_code", containerCode)); if(Cools.isEmpty(agvLocDetls)){ - log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏"); + log.info("搴撲綅鍙凤細" + locNo + "锛岃揣鏋剁爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏"); } if(agvLocDetls.size()>1){ - log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�"); + log.info("搴撲綅鍙凤細" + locNo + "锛岃揣鏋剁爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�"); } } } + + @Override + public void updateLocNo(String locNo, String sourceLoc, AgvLocDetl agvLocDetl) { + this.baseMapper.updateLocNo(locNo,sourceLoc,agvLocDetl.getSuppCode()); + } } -- Gitblit v1.9.1