From 68a456ee1c04bd473d4634b2ed6942cdab3ce1d5 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期六, 21 十二月 2024 13:54:58 +0800 Subject: [PATCH] 新增银座2楼地图SQL脚本 --- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 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..70c1b84 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -507,6 +507,9 @@ case 30: br = 3; break; + case 31: + br = 6; + break; case 40: br = 5; break; @@ -525,7 +528,9 @@ locType = 2; } else if (containerType == 30) { locType = 3; - } else { + } else if (containerType == 31) { + locType = 6; + }else { locType = agvBasDevp.getLocType1(); } @@ -1242,6 +1247,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 +1332,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