From ed0a79ffec5d25dae6b0b24393c331ab36d7d50b Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 04 六月 2024 15:35:12 +0800 Subject: [PATCH] # 自动回流数量限制 --- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 11 ----------- src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 2 +- 2 files changed, 1 insertions(+), 12 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 82b39b9..6669120 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -559,17 +559,6 @@ if (Cools.isEmpty(wrkMast)){ throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪"); } -// if(!wrkMast.getLocNo().contains("@") || !wrkMast.getSourceLocNo().contains("@")){ -// throw new CoolException("鐩爣搴撲綅鎴栬�呮簮搴撲綅鏆傛湭鍒嗛厤锛屾棤娉曞彇娑�"); -// } - //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 - //agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205); - - //if (wrkMast.getIoType() == 101) { - // agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),206,"鎵嬪姩瀹屾垚",userId); - //} else { - // agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"鎵嬪姩瀹屾垚",userId); - //} if (wrkMast.getIoType()==121){ if (wrkMast.getWrkSts()<12L){ 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 48424db..1a40d13 100644 --- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java @@ -349,7 +349,7 @@ } else if(agvLocMast.getFloor() == 2) { floor = "F2"; } - List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).or().eq("io_type", 113).like("source_loc_no", floor)); + List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("source_loc_no", floor).or().eq("io_type", 113)); if (agvWrkMasts.size() >= 5) { throw new CoolException("鏆傚仠鍥炴祦"); } -- Gitblit v1.9.1