From 65219d7a58424495f10b1e3b1d20fd483622f883 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期二, 14 十一月 2023 15:03:17 +0800 Subject: [PATCH] agv盘点改动 --- src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 20 ++------------------ 1 files changed, 2 insertions(+), 18 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 971d784..5932832 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java @@ -77,7 +77,8 @@ locDto.setContainerCode(agvLocDetl.getSuppCode()); //褰撳墠搴撲綅鎵�澶勬ゼ灞� int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]); - locDto.setAgvStaNos(queryAgvStaNosByFloor(floor)); + //locDto.setAgvStaNos(queryAgvStaNosByFloor(floor)); + locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByFloor(floor)); locDtoList.add(locDto); issued -= anfme; @@ -144,30 +145,14 @@ } else { AgvLocDetl agvLocDetl = this.selectOne(wrapper); agvLocDetl.setAnfme(anfme); - //return this.update(agvLocDetl,wrapper); - //return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0; return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 0; } } - private List<String> queryAgvStaNosByFloor(int floor){ - List<String> agvStaNos = new ArrayList<>(); - if(floor == 1){ - agvStaNos.add("CS-101"); - agvStaNos.add("CS-102"); - }else if(floor ==3){ - agvStaNos.add("CS-305"); - agvStaNos.add("CS-306"); - agvStaNos.add("CS-307"); - } - - return agvStaNos; - } private void wapperSetCondition(Wrapper wrapper,String column, String condition){ if(Cools.isEmpty(condition)){ wrapper.andNew().eq(column,"").or().isNull(column); - //wrapper.isNull(column); }else { wrapper.eq(column,condition); } @@ -183,7 +168,6 @@ taskDto.getLocDtos().forEach(locDto -> { AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getLocNo(),locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq()); - //AgvLocDetl agvLocDetl = this.selectLocdetl(locDto.getLocNo(),locDto.getMatnr(),locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq()); agvLocDetls.add(agvLocDetl); }); return agvLocDetls; -- Gitblit v1.9.1