From 0f3c5510248031f83d37613b06440faec1e58296 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 13 十一月 2023 14:39:33 +0800 Subject: [PATCH] bug修复 --- src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 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 6b13866..971d784 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java @@ -140,12 +140,13 @@ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode); wrapper.eq("loc_no", locNo); if (anfme <= 0) { - return this.delete(wrapper); + return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0; } else { AgvLocDetl agvLocDetl = this.selectOne(wrapper); agvLocDetl.setAnfme(anfme); - return this.update(agvLocDetl,wrapper); + //return this.update(agvLocDetl,wrapper); //return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0; + return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 0; } } @@ -181,15 +182,17 @@ List<AgvLocDetl> agvLocDetls = new ArrayList<>(); taskDto.getLocDtos().forEach(locDto -> { - AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq()); + 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; } @Override - public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String matnr, String batch, String csocode, String isocode) { + public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String locNo, String matnr, String batch, String csocode, String isocode) { EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>(); + wrapper.eq("loc_no",locNo); Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode); return this.selectOne(wrapper); } @@ -199,5 +202,10 @@ return this.baseMapper.sumByLocNo(locNo); } + @Override + public AgvLocDetl selectLocdetl(String locNo, String matnr, String batch, String csocode, String isocode) { + return this.baseMapper.selectLocdetl(locNo,matnr,batch,csocode,isocode); + } + } -- Gitblit v1.9.1