From 9c7b28c7b7cfc1c5f411d72e401a947eaba6b06b Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 14 一月 2025 14:49:16 +0800 Subject: [PATCH] 优化代码,移除冗余,修复bug --- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index 376531f..1fb9299 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -623,6 +623,9 @@ // 绔欑偣妫�娴� AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station); + if (Cools.isEmpty(agvBasDevp)) { + throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦�"); + } if (!agvBasDevp.getLocSts().equals("O")) { throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts() + ",鏃犳硶杩涜绌烘澘鍑哄簱"); } @@ -1242,6 +1245,9 @@ throw new CoolException(matnr + "鍟嗗搧缁存姢澶辫触"); } OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), batch, csocode); + if (orderDetl == null) { + throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�"); + } AgvWrkDetl wrkDetl = new AgvWrkDetl(); wrkDetl.sync(mat); if (orderDetl != null) { @@ -1324,6 +1330,10 @@ wrkMast.setAppeTime(now); wrkMast.setModiUser(userId); wrkMast.setModiTime(now); + if (!Cools.isEmpty(locNo) && Cools.isEmpty(pltType)) { + AgvLocMast agvLocMast = agvLocMastService.selectById(locNo); + pltType = agvLocMast.getPltType(); + } wrkMast.setPltType(pltType); wrkMast.setLogErrMemo("createWaitPainWrkMastStart"); -- Gitblit v1.9.1