diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionMainBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionMainBo.java
index c33b5548..7b3de4d4 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionMainBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionMainBo.java
@@ -7,6 +7,7 @@ import javax.validation.constraints.*;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 检验主业务对象 wms_inspection_main
@@ -29,6 +30,20 @@ public class WmsInspectionMainBo extends BaseEntity {
      */
     private Date inspectionDate;
 
+    /**
+     * 检验日期开始（用于范围筛选）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inspectionDateStart;
+
+    /**
+     * 检验日期结束（用于范围筛选）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inspectionDateEnd;
+
     /**
      * 样品名称（对应样品名称列）
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java
index b0e0ac23..3584fdb0 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java
@@ -75,11 +75,35 @@ public class WmsInspectionTensileDetailBo extends BaseEntity {
      */
     private Date productionDate;
 
+    /**
+     * 生产日期开始（用于范围筛选）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date productionDateStart;
+
+    /**
+     * 生产日期结束（用于范围筛选）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date productionDateEnd;
+
     /**
      * 试验日期
      */
     private Date testDate;
 
+    /**
+     * 试验日期开始（用于范围筛选）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date testDateStart;
+
+    /**
+     * 试验日期结束（用于范围筛选）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date testDateEnd;
+
     /**
      * 试样方向（纵/横）
      */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionMainServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionMainServiceImpl.java
index c4e80ac7..a6b9c985 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionMainServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionMainServiceImpl.java
@@ -62,6 +62,8 @@ public class WmsInspectionMainServiceImpl implements IWmsInspectionMainService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<WmsInspectionMain> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getInspectionDate() != null, WmsInspectionMain::getInspectionDate, bo.getInspectionDate());
+        lqw.ge(bo.getInspectionDateStart() != null, WmsInspectionMain::getInspectionDate, bo.getInspectionDateStart());
+        lqw.le(bo.getInspectionDateEnd() != null, WmsInspectionMain::getInspectionDate, bo.getInspectionDateEnd());
         lqw.like(StringUtils.isNotBlank(bo.getSampleName()), WmsInspectionMain::getSampleName, bo.getSampleName());
         lqw.eq(StringUtils.isNotBlank(bo.getSampleNo()), WmsInspectionMain::getSampleNo, bo.getSampleNo());
         lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsInspectionMain::getBatchNo, bo.getBatchNo());
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java
index c36e2695..417a0466 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java
@@ -71,7 +71,11 @@ public class WmsInspectionTensileDetailServiceImpl implements IWmsInspectionTens
         lqw.eq(StringUtils.isNotBlank(bo.getProductionTeam()), WmsInspectionTensileDetail::getProductionTeam, bo.getProductionTeam());
         lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStatus()), WmsInspectionTensileDetail::getSurfaceStatus, bo.getSurfaceStatus());
         lqw.eq(bo.getProductionDate() != null, WmsInspectionTensileDetail::getProductionDate, bo.getProductionDate());
+        lqw.ge(bo.getProductionDateStart() != null, WmsInspectionTensileDetail::getProductionDate, bo.getProductionDateStart());
+        lqw.le(bo.getProductionDateEnd() != null, WmsInspectionTensileDetail::getProductionDate, bo.getProductionDateEnd());
         lqw.eq(bo.getTestDate() != null, WmsInspectionTensileDetail::getTestDate, bo.getTestDate());
+        lqw.ge(bo.getTestDateStart() != null, WmsInspectionTensileDetail::getTestDate, bo.getTestDateStart());
+        lqw.le(bo.getTestDateEnd() != null, WmsInspectionTensileDetail::getTestDate, bo.getTestDateEnd());
         lqw.eq(StringUtils.isNotBlank(bo.getSampleDirection()), WmsInspectionTensileDetail::getSampleDirection, bo.getSampleDirection());
         lqw.eq(StringUtils.isNotBlank(bo.getSampleSize()), WmsInspectionTensileDetail::getSampleSize, bo.getSampleSize());
         lqw.eq(bo.getOriginalGaugeLength() != null, WmsInspectionTensileDetail::getOriginalGaugeLength, bo.getOriginalGaugeLength());