diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 11c2fe4..8aa2a12 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -71,6 +71,12 @@
             "measureContent",customer_no  AS "customerNo"
             FROM customer_sample_info
             WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND sample_no like concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND sample_name like concat('%',#{request.sampleName},'%')
+            </if>
             <if test="request.customerId != null and request.customerId !=''">
                 AND customer_id=#{request.customerId}
             </if>

diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 11c2fe4..8aa2a12 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -71,6 +71,12 @@
             "measureContent",customer_no  AS "customerNo"
             FROM customer_sample_info
             WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND sample_no like concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND sample_name like concat('%',#{request.sampleName},'%')
+            </if>
             <if test="request.customerId != null and request.customerId !=''">
                 AND customer_id=#{request.customerId}
             </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/OrderSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/OrderSampleListRequest.java
index 6e5584f..013bf1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/OrderSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/OrderSampleListRequest.java
@@ -18,4 +18,10 @@
     @ApiModelProperty(value = "委托书id(编辑状态必传)", dataType = "String")
     private String orderId;
 
+    @ApiModelProperty(value = "样品编号", dataType = "String")
+    private String sampleNo;
+
+    @ApiModelProperty(value = "样品名称", dataType = "String")
+    private String sampleName;
+
 }

diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 11c2fe4..8aa2a12 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -71,6 +71,12 @@
             "measureContent",customer_no  AS "customerNo"
             FROM customer_sample_info
             WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND sample_no like concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND sample_name like concat('%',#{request.sampleName},'%')
+            </if>
             <if test="request.customerId != null and request.customerId !=''">
                 AND customer_id=#{request.customerId}
             </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/OrderSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/OrderSampleListRequest.java
index 6e5584f..013bf1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/OrderSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/OrderSampleListRequest.java
@@ -18,4 +18,10 @@
     @ApiModelProperty(value = "委托书id(编辑状态必传)", dataType = "String")
     private String orderId;
 
+    @ApiModelProperty(value = "样品编号", dataType = "String")
+    private String sampleNo;
+
+    @ApiModelProperty(value = "样品名称", dataType = "String")
+    private String sampleName;
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index 82d0530..635a7ee 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -179,6 +179,7 @@
         return page;
     }
 
+    @Override
     public Page<MultiItemSampleListResponse> listPageByInterchange(Page<MultiItemSampleListResponse> page, InterchangeSampleListRequest request)  throws Exception{
         page.setRecords(this.baseMapper.listPageByInterchange(page, request));
         for (MultiItemSampleListResponse multiItemSampleResponse : page.getRecords()) {
@@ -187,6 +188,7 @@
         return page;
     }
 
+    @Override
     public Page<MultiItemSampleListResponse> listPageBySubpackage(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request)  throws Exception{
         page.setRecords(this.baseMapper.listPageBySubpackage(page, request));
         for (MultiItemSampleListResponse multiItemSampleResponse : page.getRecords()) {