From 881a7929fa7dd056449faef10fd8eaeb690c7975 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 8 Dec 2023 13:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/service/location/LocationServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index 5710ddfb..908dd300 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -321,6 +321,7 @@ public class LocationServiceImpl implements LocationService { } //增加过滤条件 QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("available", "TRUE"); List locationTypeList = new ArrayList<>(); locationTypeList.add("RAW"); locationTypeList.add("SEMI"); @@ -398,9 +399,10 @@ public class LocationServiceImpl implements LocationService { List notEmptyList = new ArrayList<>(); for (LocationDO locationDO : locationDOList) { List balanceDOList = balanceMapper.getBalanceList(null, null, null, null, locationDO.getCode()); - if (balanceDOList.isEmpty()) { + if (balanceDOList.isEmpty()) {//空库位 emptyList.add(locationDO); - } else { + } else {//非空库位 + //库位上存在物品，判断可以混物品、可以混批次、可以混状态 boolean flag = true; for (BalanceDO balanceDO : balanceDOList) { if ("TRUE".equals(enableMixItem) && !itemCode.equals(balanceDO.getItemCode())) {