diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java
index b4d7094d..00186e1b 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java
@@ -1,10 +1,12 @@
 package com.bonus.material.repair.domain;
 
+import com.bonus.material.basic.domain.BmFileInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author syruan
@@ -100,6 +102,9 @@ public class RepairPart {
     @ApiModelProperty(value = "维修内容")
     private String repairContent;
 
+    @ApiModelProperty(value = "附件列表")
+    private List<BmFileInfo> fileList;
+
     private Long companyId;
 
     private Long repairer;
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java
index 32fd8a56..54d45302 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java
@@ -1,6 +1,7 @@
 package com.bonus.material.repair.domain.vo;
 
 import com.bonus.common.biz.domain.BaseVO;
+import com.bonus.material.basic.domain.BmFileInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -69,4 +70,7 @@ public class RepairDeviceListVo extends BaseVO {
 
     @ApiModelProperty(value = "内层物资类型集合")
     private List<RepairDeviceVO> repairDeviceList = new ArrayList<>();
+
+    @ApiModelProperty(value = "报废附件")
+    private List<BmFileInfo> fileList;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
index 5ec52acd..e5761bec 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
@@ -129,10 +129,18 @@ public class RepairServiceImpl implements RepairService {
             }
             // 查询维修任务详情
             List<RepairDeviceListVo> repairMaTypeGroupList = getRepairMaTypeList(new RepairTaskDetails(taskId), true);
+            repairMaTypeGroupList.removeIf(Objects::isNull);
+            repairMaTypeGroupList.forEach(repairDevice -> {
+                List<BmFileInfo> fileInfos = bmFileInfoMapper.selectBmFileInfoList(new BmFileInfo()
+                        .setTaskId(OptionalLong.of(thisTaskId).orElse(0L))
+                        .setModelId(Optional.ofNullable(repairDevice.getId()).orElse(0L))
+                        .setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId())
+                );
+                repairDevice.setFileList(fileInfos);
+            });
 
             List<RepairPart> repairPartList = repairAuditDetailsMapper.getPartDetailsByTaskId(new RepairAuditDetails().setTaskId(thisTaskId));
             repairPartList = mergePartsNum(repairPartList);
-
             RepairTicketVo result = new RepairTicketVo()
                     .setRepairTaskInfo(repairTaskInfo)
                     .setRepairDeviceArray(repairMaTypeGroupList)