From 509f2444e9df49b4297384ab9ae2a30ba7e0aa56 Mon Sep 17 00:00:00 2001 From: jinna Date: Wed, 24 Jun 2026 17:37:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StStorageLocationController.java | 20 ++++++++++++++++++- .../wms/mapper/StStorageLocationMapper.xml | 1 - 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java index b83308a70..c52822cc1 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java @@ -240,7 +240,25 @@ public class StStorageLocationController extends BladeController { //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(StStorageLocation::getTenantId, bladeUser.getTenantId()); //} - queryWrapper.lambda().eq(StStorageLocation::getIsDeleted, BladeConstant.DB_NOT_DELETED); + queryWrapper.clear(); + Object shIdObj = stStorageLocation.get("shId"); + String shId = shIdObj != null ? shIdObj.toString() : ""; + if (org.springblade.core.tool.utils.StringUtil.isNotBlank(shId)) { + queryWrapper.like("sl.sh_id", shId); + } + + Object locationObj = stStorageLocation.get("location"); + String location = locationObj != null ? locationObj.toString().trim() : ""; + if (org.springblade.core.tool.utils.StringUtil.isNotBlank(location)) { + queryWrapper.like("sl.location", location); + } + + Object goodsCodeObj = stStorageLocation.get("goodsCode"); + String goodsCode = goodsCodeObj != null ? goodsCodeObj.toString().trim() : ""; + if (org.springblade.core.tool.utils.StringUtil.isNotBlank(goodsCode)) { + queryWrapper.like("sl.goods_code", goodsCode); + } + queryWrapper.eq("sl.is_deleted", BladeConstant.DB_NOT_DELETED); List list = stStorageLocationService.exportStStorageLocation(queryWrapper); ExcelUtil.export(response, "库位维护表数据" + DateUtil.time(), "库位维护表数据表", list, StStorageLocationExcel.class); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.xml index 8be196f68..d7cc22f8a 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.xml @@ -135,7 +135,6 @@ sh.sh_name FROM st_storage_location sl LEFT JOIN st_storehouse sh ON sl.sh_id = sh.id - WHERE 1=1 ${ew.customSqlSegment}