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 13151c2f..82c61f14 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
@@ -374,11 +374,13 @@ public class AftersalesWarehouseOutController extends BaseController
      */
     @PostMapping("/showAftersalesShippingDeviceListTwo")
     @ResponseBody
-    public TableDataInfo showAftersalesShippingDeviceListTwo(@RequestParam("materialNo") String materialNo)
+    public TableDataInfo showAftersalesShippingDeviceListTwo(@RequestParam("materialNo") String materialNo,
+                                                             @RequestParam("salesOrderCode") String salesOrderCode,
+                                                             @RequestParam("makeNo") String makeNo)
     {
 
         startPage();
-        List<SelectShippingDeviceVO> list = warehouseOutOrderService.showAftersalesShippingDeviceListTwo(materialNo);
+        List<SelectShippingDeviceVO> list = warehouseOutOrderService.showAftersalesShippingDeviceListTwo(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 98795dfc..f2e99701 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
@@ -134,7 +134,7 @@ public interface IAftersalesWarehouseOutService
     /**
      * 展示售后第二次维护设备料号已选择添加出货设备的相关出货设备信息
      */
-    List<SelectShippingDeviceVO> showAftersalesShippingDeviceListTwo(String materialNo);
+    List<SelectShippingDeviceVO> showAftersalesShippingDeviceListTwo(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 35baf057..12352ef4 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
@@ -302,12 +302,14 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu
      * 展示售后第二次维护设备料号已选择添加出货设备的相关出货设备信息
      */
     @Override
-    public List<SelectShippingDeviceVO> showAftersalesShippingDeviceListTwo(String materialNo) {
+    public List<SelectShippingDeviceVO> showAftersalesShippingDeviceListTwo(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/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java
index 130a7a03..1c1d2cf3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java
@@ -237,10 +237,12 @@ public class WarehouseOutOrderController extends BaseController
      */
     @PostMapping("/getShippingDeviceList")
     @ResponseBody
-    public TableDataInfo getShippingDeviceList(@RequestParam("materialNo") String materialNo)
+    public TableDataInfo getShippingDeviceList(@RequestParam("materialNo") String materialNo,
+                                               @RequestParam("salesOrderCode") String salesOrderCode,
+                                               @RequestParam("makeNo") String makeNo)
     {
         startPage();
-        List<SelectShippingDeviceVO> list = aftersalesWarehouseOutService.showAftersalesShippingDeviceListTwo(materialNo);
+        List<SelectShippingDeviceVO> list = aftersalesWarehouseOutService.showAftersalesShippingDeviceListTwo(materialNo,salesOrderCode,makeNo);
         return getDataTable(list);
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html
index e1f67e66..6a0cbe54 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html
@@ -252,7 +252,9 @@
             contentType: "application/x-www-form-urlencoded",
             queryParams : {
                 // salesOrderCode: warehouseOutOrder.salesOrderCode,
-                materialNo: parentRow.materialNo
+                materialNo: parentRow.materialNo,
+                salesOrderCode:warehouseOutOrder.salesOrderCode,
+                makeNo:warehouseOutOrder.makeNo
             },
             columns: [
                 {
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
index 55513cc8..cb12ce9b 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
@@ -267,6 +267,8 @@
             contentType: "application/x-www-form-urlencoded",
             queryParams : {
                 materialNo: row.materialNo,
+                salesOrderCode:warehouseOutOrder.salesOrderCode,
+                makeNo:warehouseOutOrder.makeNo
             },
             columns: [
                 {