diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java
index 0157cb13..d8a5b802 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java
@@ -5,6 +5,7 @@ import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
@@ -44,8 +45,8 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService {
      */
     @Override
     public TableDataInfo<WmsOrderDetailVo> queryPageList(WmsOrderDetailBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsOrderDetail> lqw = buildQueryWrapper(bo);
-        Page<WmsOrderDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
+        QueryWrapper<WmsOrderDetail> qw = buildQueryWrapper(bo);
+        Page<WmsOrderDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
         return TableDataInfo.build(result);
     }
 
@@ -54,18 +55,18 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService {
      */
     @Override
     public List<WmsOrderDetailVo> queryList(WmsOrderDetailBo bo) {
-        LambdaQueryWrapper<WmsOrderDetail> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<WmsOrderDetail> qw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(qw);
     }
 
-    private LambdaQueryWrapper<WmsOrderDetail> buildQueryWrapper(WmsOrderDetailBo bo) {
+    private QueryWrapper<WmsOrderDetail> buildQueryWrapper(WmsOrderDetailBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<WmsOrderDetail> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getOrderId() != null, WmsOrderDetail::getOrderId, bo.getOrderId());
-        lqw.eq(bo.getProductId() != null, WmsOrderDetail::getProductId, bo.getProductId());
-        lqw.eq(bo.getQuantity() != null, WmsOrderDetail::getQuantity, bo.getQuantity());
-        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsOrderDetail::getUnit, bo.getUnit());
-        return lqw;
+        QueryWrapper<WmsOrderDetail> qw = new QueryWrapper<>();
+        qw.eq(bo.getOrderId() != null, "d.order_id", bo.getOrderId());
+        qw.eq(bo.getProductId() != null, "d.product_id", bo.getProductId());
+        qw.eq(bo.getQuantity() != null, "d.quantity", bo.getQuantity());
+        qw.eq(StringUtils.isNotBlank(bo.getUnit()), "d.unit", bo.getUnit());
+        return qw;
     }
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java
index 04fb7d8f..2f8b289a 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java
@@ -14,6 +14,7 @@ import com.klp.domain.vo.WmsProductBomVo;
 import com.klp.domain.WmsProductBom;
 import com.klp.mapper.WmsProductBomMapper;
 import com.klp.service.IWmsProductBomService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.util.List;
 import java.util.Map;
@@ -44,8 +45,8 @@ public class WmsProductBomServiceImpl implements IWmsProductBomService {
      */
     @Override
     public TableDataInfo<WmsProductBomVo> queryPageList(WmsProductBomBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsProductBom> lqw = buildQueryWrapper(bo);
-        Page<WmsProductBomVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
+        QueryWrapper<WmsProductBom> qw = buildQueryWrapper(bo);
+        Page<WmsProductBomVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
         return TableDataInfo.build(result);
     }
 
@@ -54,18 +55,18 @@ public class WmsProductBomServiceImpl implements IWmsProductBomService {
      */
     @Override
     public List<WmsProductBomVo> queryList(WmsProductBomBo bo) {
-        LambdaQueryWrapper<WmsProductBom> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<WmsProductBom> qw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(qw);
     }
 
-    private LambdaQueryWrapper<WmsProductBom> buildQueryWrapper(WmsProductBomBo bo) {
+    private QueryWrapper<WmsProductBom> buildQueryWrapper(WmsProductBomBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<WmsProductBom> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getProductId() != null, WmsProductBom::getProductId, bo.getProductId());
-        lqw.eq(bo.getRawMaterialId() != null, WmsProductBom::getRawMaterialId, bo.getRawMaterialId());
-        lqw.eq(bo.getQuantity() != null, WmsProductBom::getQuantity, bo.getQuantity());
-        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsProductBom::getUnit, bo.getUnit());
-        return lqw;
+        QueryWrapper<WmsProductBom> qw = new QueryWrapper<>();
+        qw.eq(bo.getProductId() != null, "b.product_id", bo.getProductId());
+        qw.eq(bo.getRawMaterialId() != null, "b.raw_material_id", bo.getRawMaterialId());
+        qw.eq(bo.getQuantity() != null, "b.quantity", bo.getQuantity());
+        qw.eq(StringUtils.isNotBlank(bo.getUnit()), "b.unit", bo.getUnit());
+        return qw;
     }
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java
index 761200bd..5495acbc 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java
@@ -5,6 +5,7 @@ import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
@@ -44,8 +45,8 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS
      */
     @Override
     public TableDataInfo<WmsPurchasePlanDetailVo> queryPageList(WmsPurchasePlanDetailBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsPurchasePlanDetail> lqw = buildQueryWrapper(bo);
-        Page<WmsPurchasePlanDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
+        QueryWrapper<WmsPurchasePlanDetail> qw = buildQueryWrapper(bo);
+        Page<WmsPurchasePlanDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
         return TableDataInfo.build(result);
     }
 
@@ -54,19 +55,19 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS
      */
     @Override
     public List<WmsPurchasePlanDetailVo> queryList(WmsPurchasePlanDetailBo bo) {
-        LambdaQueryWrapper<WmsPurchasePlanDetail> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<WmsPurchasePlanDetail> qw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(qw);
     }
 
-    private LambdaQueryWrapper<WmsPurchasePlanDetail> buildQueryWrapper(WmsPurchasePlanDetailBo bo) {
+    private QueryWrapper<WmsPurchasePlanDetail> buildQueryWrapper(WmsPurchasePlanDetailBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<WmsPurchasePlanDetail> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getPlanId() != null, WmsPurchasePlanDetail::getPlanId, bo.getPlanId());
-        lqw.eq(bo.getRawMaterialId() != null, WmsPurchasePlanDetail::getRawMaterialId, bo.getRawMaterialId());
-        lqw.eq(StringUtils.isNotBlank(bo.getOwner()), WmsPurchasePlanDetail::getOwner, bo.getOwner());
-        lqw.eq(bo.getQuantity() != null, WmsPurchasePlanDetail::getQuantity, bo.getQuantity());
-        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsPurchasePlanDetail::getUnit, bo.getUnit());
-        return lqw;
+        QueryWrapper<WmsPurchasePlanDetail> qw = new QueryWrapper<>();
+        qw.eq(bo.getPlanId() != null, "wpd.plan_id", bo.getPlanId());
+        qw.eq(bo.getRawMaterialId() != null, "wpd.raw_material_id", bo.getRawMaterialId());
+        qw.eq(StringUtils.isNotBlank(bo.getOwner()), "wpd.owner", bo.getOwner());
+        qw.eq(bo.getQuantity() != null, "wpd.quantity", bo.getQuantity());
+        qw.eq(StringUtils.isNotBlank(bo.getUnit()), "wpd.unit", bo.getUnit());
+        return qw;
     }
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java
index 3bb158ed..a181bd52 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Collection;
 import java.util.Date;
 import com.klp.common.exception.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 /**
  * 出入库单明细Service业务层处理
@@ -50,8 +51,8 @@ public class WmsStockIoDetailServiceImpl implements IWmsStockIoDetailService {
      */
     @Override
     public TableDataInfo<WmsStockIoDetailVo> queryPageList(WmsStockIoDetailBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsStockIoDetail> lqw = buildQueryWrapper(bo);
-        Page<WmsStockIoDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
+        QueryWrapper<WmsStockIoDetail> qw = buildQueryWrapper(bo);
+        Page<WmsStockIoDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
         return TableDataInfo.build(result);
     }
 
@@ -60,21 +61,21 @@ public class WmsStockIoDetailServiceImpl implements IWmsStockIoDetailService {
      */
     @Override
     public List<WmsStockIoDetailVo> queryList(WmsStockIoDetailBo bo) {
-        LambdaQueryWrapper<WmsStockIoDetail> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<WmsStockIoDetail> qw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(qw);
     }
 
-    private LambdaQueryWrapper<WmsStockIoDetail> buildQueryWrapper(WmsStockIoDetailBo bo) {
+    private QueryWrapper<WmsStockIoDetail> buildQueryWrapper(WmsStockIoDetailBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<WmsStockIoDetail> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getStockIoId() != null, WmsStockIoDetail::getStockIoId, bo.getStockIoId());
-        lqw.eq(bo.getWarehouseId() != null, WmsStockIoDetail::getWarehouseId, bo.getWarehouseId());
-        lqw.eq(StringUtils.isNotBlank(bo.getItemType()), WmsStockIoDetail::getItemType, bo.getItemType());
-        lqw.eq(bo.getItemId() != null, WmsStockIoDetail::getItemId, bo.getItemId());
-        lqw.eq(bo.getQuantity() != null, WmsStockIoDetail::getQuantity, bo.getQuantity());
-        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsStockIoDetail::getUnit, bo.getUnit());
-        lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsStockIoDetail::getBatchNo, bo.getBatchNo());
-        return lqw;
+        QueryWrapper<WmsStockIoDetail> qw = new QueryWrapper<>();
+        qw.eq(bo.getStockIoId() != null, "d.stock_io_id", bo.getStockIoId());
+        qw.eq(bo.getWarehouseId() != null, "d.warehouse_id", bo.getWarehouseId());
+        qw.eq(StringUtils.isNotBlank(bo.getItemType()), "d.item_type", bo.getItemType());
+        qw.eq(bo.getItemId() != null, "d.item_id", bo.getItemId());
+        qw.eq(bo.getQuantity() != null, "d.quantity", bo.getQuantity());
+        qw.eq(StringUtils.isNotBlank(bo.getUnit()), "d.unit", bo.getUnit());
+        qw.eq(StringUtils.isNotBlank(bo.getBatchNo()), "d.batch_no", bo.getBatchNo());
+        return qw;
     }
 
     /**
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
index 16b50630..9fbc2725 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         wm.raw_material_code AS rawMaterialCode
     FROM
         wms_purchase_plan_detail wpd
-    LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.material_id
+    LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.raw_material_id
     ${ew.customSqlSegment}
     </select>