diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
index 5bd682f..2963f1d 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -85,7 +85,9 @@ public class ShipmentHeaderController extends BaseController {
     @Log(title = "出库-出库单", operating = "查看出库主单", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(ShipmentHeader shipmentHeader, String createdBegin, String createdEnd,Integer shipmentHeaderStatus) {
+    public TableDataInfo list(ShipmentHeader shipmentHeader,
+                              String createdBegin, String createdEnd,
+                              Integer shipmentHeaderStatus,String materialCode) {
         LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
@@ -121,8 +123,13 @@ public class ShipmentHeaderController extends BaseController {
                 .eq(shipmentHeader.getFirstStatus() != null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus())
                 .eq(shipmentHeader.getLastStatus() != null, ShipmentHeader::getLastStatus, shipmentHeader.getLastStatus())
                 .lt(StringUtils.isNotNull(shipmentHeaderStatus), ShipmentHeader::getLastStatus, shipmentHeaderStatus)
-                .eq(StringUtils.isNotNull(shipmentHeader.getPushSuccessStatus()),ShipmentHeader::getPushSuccessStatus,shipmentHeader.getPushSuccessStatus())
-                .orderByDesc(ShipmentHeader::getId);
+                .eq(StringUtils.isNotNull(shipmentHeader.getPushSuccessStatus()),ShipmentHeader::getPushSuccessStatus,shipmentHeader.getPushSuccessStatus());
+
+
+        if(StringUtils.isNotEmpty(materialCode)){
+            lambdaQueryWrapper.apply(" id in(select shipmentId from shipment_detail where materialCode ='"+materialCode+"' )");
+        }
+        lambdaQueryWrapper.orderByDesc(ShipmentHeader::getId);
 
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
             /**