diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java
index f0c0e76b..f52ae2ae 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java
@@ -1,6 +1,7 @@
 package com.klp.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,7 +46,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
      */
     @Override
     public TableDataInfo<WmsStockVo> queryPageList(WmsStockBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
+        QueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
         Page<WmsStockVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -55,20 +56,26 @@ public class WmsStockServiceImpl implements IWmsStockService {
      */
     @Override
     public List<WmsStockVo> queryList(WmsStockBo bo) {
-        LambdaQueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
+        QueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
 
-    private LambdaQueryWrapper<WmsStock> buildQueryWrapper(WmsStockBo bo) {
+    private QueryWrapper<WmsStock> buildQueryWrapper(WmsStockBo bo) {  // 注意：这里改用 QueryWrapper 而非 LambdaQueryWrapper
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<WmsStock> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getWarehouseId() != null, WmsStock::getWarehouseId, bo.getWarehouseId());
-        lqw.eq(StringUtils.isNotBlank(bo.getItemType()), WmsStock::getItemType, bo.getItemType());
-        lqw.eq(bo.getItemId() != null, WmsStock::getItemId, bo.getItemId());
-        lqw.eq(bo.getQuantity() != null, WmsStock::getQuantity, bo.getQuantity());
-        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsStock::getUnit, bo.getUnit());
-        lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsStock::getBatchNo, bo.getBatchNo());
-        return lqw;
+        QueryWrapper<WmsStock> qw = Wrappers.query();  // 使用普通 QueryWrapper
+
+        // 1. 明确指定 wms_stock 表的 del_flag（表别名 s）
+        qw.eq("s.del_flag", 0);
+
+        // 2. 其他条件也明确指定表别名 s（因为都是 wms_stock 表的字段）
+        qw.eq(bo.getWarehouseId() != null, "s.warehouse_id", bo.getWarehouseId());
+        qw.eq(StringUtils.isNotBlank(bo.getItemType()), "s.item_type", bo.getItemType());
+        qw.eq(bo.getItemId() != null, "s.item_id", bo.getItemId());
+        qw.eq(bo.getQuantity() != null, "s.quantity", bo.getQuantity());
+        qw.eq(StringUtils.isNotBlank(bo.getUnit()), "s.unit", bo.getUnit());
+        qw.eq(StringUtils.isNotBlank(bo.getBatchNo()), "s.batch_no", bo.getBatchNo());
+
+        return qw;
     }
 
     /**
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
index 9a1d02af..9609c64c 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
@@ -42,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM wms_stock s
         LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id
         LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id
-        WHERE s.del_flag = 0
         ${ew.customSqlSegment}
     </select>