From 368061fade130fab3a1df1cb1ab5e50d6f20a112 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 09 十月 2023 10:58:23 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 f9759e6..aafa7b2 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java @@ -122,7 +122,7 @@ if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){ AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>() - .eq("zpallet", agvBasDevpDto.getBarcode())); + .eq("supp_code", agvBasDevpDto.getBarcode())); agvBasDevpDto.setAgvWaitPakin(agvWaitPakin); @@ -134,7 +134,9 @@ } } - setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto); + if(!Cools.isEmpty(agvWrkMast)){ + setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto); + } return agvBasDevpDto; -- Gitblit v1.9.1