From a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期六, 23 十二月 2023 19:56:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1 --- src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java index 38cc451..85f1aad 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java @@ -167,7 +167,11 @@ } if(agvWrkMast.getIoType() == 53){ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime()); - agvWrkDetl.setVolume(agvLocDetl.getAnfme()); + if(Cools.isEmpty(agvLocDetl)){ + agvWrkDetl.setVolume(0.0); + }else { + agvWrkDetl.setVolume(agvLocDetl.getAnfme()); + } } } -- Gitblit v1.9.1