From fce34ab8e1453d7376de56eca7eff01576e62745 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期六, 18 五月 2024 16:52:23 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java index 1aca5fd..73a5e0a 100644 --- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java @@ -45,6 +45,17 @@ return SUCCESS; } + public ReturnT<String> start2(AgvWrkMast agvWrkMast) { + // locType 1. 鑷姩锛� 2. 鎵嬪姩 + doAutoMove2(agvWrkMast); + return SUCCESS; + } + public ReturnT<String> start3(AgvWrkMast agvWrkMast) { + // locType 1. 鑷姩锛� 2. 鎵嬪姩 + doHandMove2(agvWrkMast); + return SUCCESS; + } + private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) { Date now = new Date(); //鏌ヨ宸ヤ綔妗� @@ -168,6 +179,33 @@ return SUCCESS; } + private ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) { + Date now = new Date(); + //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅 + AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo()); + if (Cools.isEmpty(locMast)) { + throw new CoolException("鏆傛棤搴撲綅"); + } + agvWrkMast.setWrkSts(201L); + agvWrkMast.setLocNo(locMast.getLocNo()); + agvWrkMastService.updateById(agvWrkMast); + //鏇存柊鐩爣搴撲綅鐘舵�� + updateAgvLocMast(locMast,"S"); + + return SUCCESS; + } + private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) { + Date now = new Date(); + AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1); + if (Cools.isEmpty(devpNo)) { + throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�"); + } + agvWrkMast.setWrkSts(201L); + agvWrkMast.setLocNo(devpNo.getDevNo()); + agvWrkMastService.updateById(agvWrkMast); + updateAgvBasDevp(devpNo,"S",null,agvWrkMast.getBarcode()); + return SUCCESS; + } /* 鏇存柊鐩爣搴撲綅淇℃伅 */ -- Gitblit v1.9.1