From a10756d46eefb2ab9b23486ebbad0ee785325b7f Mon Sep 17 00:00:00 2001
From: jinna <jinna123>
Date: Wed, 24 Jun 2026 18:50:53 +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

---
 .../controller/StStorehouseController.java    | 25 ++++++++++++-------
 .../wms/excel/StStorehouseExcel.java          |  4 +--
 .../wms/mapper/StStorehouseMapper.xml         | 16 ++++++++++++
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java
index 91833ba18..dbe6e8514 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java
@@ -21,6 +21,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
@@ -338,26 +339,32 @@ public class StStorehouseController extends BladeController {
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(StStorehouse::getTenantId, bladeUser.getTenantId());
 		//}
+		queryWrapper.clear();
 		String shCode = Func.toStr(stStorehouse.get("shCode"));
 		if (StrUtil.isNotBlank(shCode)) {
-			queryWrapper.lambda().like(StStorehouse::getShCode, shCode);
+			queryWrapper.like("sh.sh_code", shCode);
 		}
-		// 库房名称模糊查询
+
 		String shName = Func.toStr(stStorehouse.get("shName"));
 		if (StrUtil.isNotBlank(shName)) {
-			queryWrapper.lambda().like(StStorehouse::getShName, shName);
+			queryWrapper.like("sh.sh_name", shName);
 		}
-		// 所属工装类型精准匹配
+
 		String toolingType = Func.toStr(stStorehouse.get("toolingType"));
 		if (StrUtil.isNotBlank(toolingType)) {
-			queryWrapper.lambda().eq(StStorehouse::getToolingType, toolingType);
+			queryWrapper.eq("sh.tooling_type", toolingType);
 		}
-		// 保管员ID精准匹配（下拉框传ID）
+
+		String type = Func.toStr(stStorehouse.get("type"));
+		if (StrUtil.isNotBlank(type)) {
+			queryWrapper.eq("sh.type", type);
+		}
+
 		Long saveUser = Func.toLong(stStorehouse.get("saveUser"));
-		if (saveUser != null) {
-			queryWrapper.lambda().eq(StStorehouse::getSaveUser, saveUser);
+		if (saveUser != null && saveUser > 0) {
+			queryWrapper.eq("sh.save_user", saveUser);
 		}
-		//queryWrapper.lambda().eq(StStorehouseEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.eq("sh.is_deleted", BladeConstant.DB_NOT_DELETED);
 		List<StStorehouseExcel> list = stStorehouseService.exportStStorehouse(queryWrapper);
 		ExcelUtil.export(response, "库房维护表数据" + DateUtil.time(), "库房维护表数据表", list, StStorehouseExcel.class);
 	}
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StStorehouseExcel.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StStorehouseExcel.java
index ae059012e..fb3987847 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StStorehouseExcel.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StStorehouseExcel.java
@@ -50,13 +50,13 @@ public class StStorehouseExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("所属工装类型")
-	private Long toolingType;
+	private String toolingTypeName;
 	/**
 	 * 所属类别
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("所属类别")
-	private Long type;
+	private String typeName;
 	/**
 	 * 库房层级
 	 */
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.xml
index da9e0e2ca..da6242b3e 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.xml
@@ -96,6 +96,22 @@
     <select id="exportStStorehouse" resultType="org.springblade.wms.excel.StStorehouseExcel">
         SELECT
             sh.*,
+            CASE sh.tooling_type
+                WHEN 0 THEN '模具'
+                WHEN 1 THEN '工装'
+                WHEN 2 THEN '量具'
+                ELSE ''
+                END AS tooling_type_name,
+            CASE sh.type
+                WHEN 0 THEN '模具库'
+                WHEN 1 THEN '材料库'
+                WHEN 2 THEN '刀具库'
+                WHEN 3 THEN '工装库'
+                WHEN 4 THEN '电极库'
+                WHEN 5 THEN '量具库'
+                WHEN 6 THEN '夹具库'
+                ELSE ''
+                END AS type_name,
             su.real_name AS saveUserName
         FROM ST_STOREHOUSE sh
                  LEFT JOIN BLADE_USER su ON sh.save_user = su.id