diff --git a/src/main/java/com/huaheng/pc/barcode/barcodeHeader/controller/BarCodeHeaderController.java b/src/main/java/com/huaheng/pc/barcode/barcodeHeader/controller/BarCodeHeaderController.java
index 1fb241b..810f5f0 100644
--- a/src/main/java/com/huaheng/pc/barcode/barcodeHeader/controller/BarCodeHeaderController.java
+++ b/src/main/java/com/huaheng/pc/barcode/barcodeHeader/controller/BarCodeHeaderController.java
@@ -142,6 +142,8 @@ public class BarCodeHeaderController extends BaseController {
                 .like(StringUtils.isNotEmpty(barCodeHeader.getBarCodeHeaderCode()), BarCodeHeader::getBarCodeHeaderCode, barCodeHeader.getBarCodeHeaderCode())
                 .like(StringUtils.isNotEmpty(barCodeHeader.getCode()), BarCodeHeader::getCode, barCodeHeader.getCode())
                 .eq(StringUtils.isNotEmpty(barCodeHeader.getFbillno()), BarCodeHeader::getFbillno, barCodeHeader.getFbillno())
+                .like(StringUtils.isNotEmpty(barCodeHeader.getMaterialCode()), BarCodeHeader::getMaterialCode, barCodeHeader.getMaterialCode())
+                .like(StringUtils.isNotEmpty(barCodeHeader.getMaterialName()), BarCodeHeader::getMaterialName, barCodeHeader.getMaterialName())
                 .orderByDesc(BarCodeHeader::getCreated);
 
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
diff --git a/src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html b/src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
index d103d15..ff2cc1f 100644
--- a/src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
+++ b/src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
@@ -42,6 +42,12 @@
                                         工单号：<input type="text" name="fbillno" id="fbillno"/>
                                     </li>
                                     <li>
+                                        物料编码：<input type="text" name="materialCode"/>
+                                    </li>
+                                    <li>
+                                        物料名称：<input type="text" name="materialName"/>
+                                    </li>
+                                    <li>
                                         锁定状态：<select id="locked" name="locked" th:with="list=${@companyService.getCode()}">
                                         <option value="">所有</option>
                                         <option value="1">未入库</option>