diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
index c7c006b1..13151c2f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
@@ -260,11 +260,13 @@ public class AftersalesWarehouseOutController extends BaseController
      */
     @PostMapping("/showAftersalesShippingDeviceListOne")
     @ResponseBody
-    public TableDataInfo showAftersalesShippingDeviceListOne(@RequestParam("materialNo") String materialNo)
+    public TableDataInfo showAftersalesShippingDeviceListOne(@RequestParam("materialNo") String materialNo,
+                                                             @RequestParam("salesOrderCode") String salesOrderCode,
+                                                             @RequestParam("makeNo") String makeNo)
     {
 
         startPage();
-        List<SelectShippingDeviceVO> list = warehouseOutOrderService.showAftersalesShippingDeviceList(materialNo);
+        List<SelectShippingDeviceVO> list = warehouseOutOrderService.showAftersalesShippingDeviceList(materialNo,salesOrderCode,makeNo);
         return getDataTable(list);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
index 32fb8a6f..98795dfc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
@@ -123,7 +123,7 @@ public interface IAftersalesWarehouseOutService
     /**
      * 展示售后第一次维护设备料号已选择添加出货设备的相关出货设备信息
      * */
-    List<SelectShippingDeviceVO> showAftersalesShippingDeviceList(String materialNo);
+    List<SelectShippingDeviceVO> showAftersalesShippingDeviceList(String materialNo,String salesOrderCode,String makeNo);
 
     /**
      * 修改保存售后第一次维护设备
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java
index 4c05cc7a..35baf057 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java
@@ -229,12 +229,14 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu
      * 展示售后第一次维护设备料号已选择添加出货设备的相关出货设备信息
      * */
     @Override
-    public List<SelectShippingDeviceVO> showAftersalesShippingDeviceList(String materialNo) {
+    public List<SelectShippingDeviceVO> showAftersalesShippingDeviceList(String materialNo,String salesOrderCode,String makeNo) {
 
         List<SelectShippingDeviceVO> selectShippingDeviceVOs = new ArrayList<>();
         AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
         afterSalesShippingDevice.setMaterialNo(materialNo);
-        List<AfterSalesShippingDevice> afterSalesShippingDevices = shippingDeviceMapper.selectShippingDeviceListByMaterialNo(afterSalesShippingDevice);
+        afterSalesShippingDevice.setSalesOrderCode(salesOrderCode);
+        afterSalesShippingDevice.setMakeNo(makeNo);
+        List<AfterSalesShippingDevice> afterSalesShippingDevices = shippingDeviceMapper.selectAfterSalesShippingDeviceByNoAndCode(afterSalesShippingDevice);
         List<AfterSalesShippingDevice> filterAfterSalesShippingDevices = afterSalesShippingDevices.stream().filter(shippingDevice -> "0".equals(shippingDevice.getAddShippingDeviceFlag())).collect(Collectors.toList());
         if (!StringUtils.isNotEmpty(filterAfterSalesShippingDevices)) {
             // 记录日志
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
index 1db56a09..ab79c843 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
@@ -244,7 +244,9 @@
       contentType: "application/x-www-form-urlencoded",
       queryParams : {
         // salesOrderCode: warehouseOutOrder.salesOrderCode,
-        materialNo: parentRow.materialNo
+        materialNo: parentRow.materialNo,
+        salesOrderCode:warehouseOutOrder.salesOrderCode,
+        makeNo:warehouseOutOrder.makeNo
       },
       columns: [
         {