From 00985eabb51145130d4fa253b153aaeeec3a957a Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期日, 24 三月 2024 20:22:05 +0800 Subject: [PATCH] # app version --- src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java index dd8095c..88f5250 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java @@ -27,7 +27,7 @@ public void initLocFloor1() { //1妤� 13鎺� 86鍒� 12灞� - List<AgvLocMast> agvLocMastList = getLocMastList(1,33,1,45,1,1,1); + List<AgvLocMast> agvLocMastList = getLocMastList(1,45,1,33,1,1,1); this.insertBatch(agvLocMastList); } @@ -120,15 +120,15 @@ return false; } } else if (row == 6) { - if (bay < 20 || bay == 25 || bay == 30) { + if (bay < 20 || bay == 26 || bay == 30) { return false; } } else if (row == 7) { - if (bay < 4 || bay == 25) { + if (bay < 4 || bay == 26) { return false; } } else if (row == 9 || row ==10 ) { - if (bay < 4 || bay == 12 || bay == 25) { + if (bay < 4 || bay == 12 || bay == 26) { return false; } } else if (row == 12) { @@ -208,4 +208,11 @@ //return this.agvLocMastMapper.selectLocByLevAndFloor(lev,floor); } + @Override + public AgvLocMast selectEmptyZpallet(int type) { + + return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type)); + + } + } -- Gitblit v1.9.1