1 년 전
부모
커밋
36e055ab47
1개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 8 6
      platform-rest/src/main/java/com/platform/rest/controller/sb/SbModelSpareBomController.java

+ 8 - 6
platform-rest/src/main/java/com/platform/rest/controller/sb/SbModelSpareBomController.java

@@ -39,6 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description 型号库-备件bom关联 控制器
@@ -82,17 +83,18 @@ public class SbModelSpareBomController {
     @GetMapping("/getBomByPositionNo")
     public R getBomByPositionNo(SbModelSpareBomDTO sbModelSpareBomDTO) {
         SbInfo sbInfo = new SbInfo();
-        sbInfo.setPositionNo(sbModelSpareBomDTO.getPositionNo());
-        List<SbInfo> sbInfos = sbInfoMapper.select(sbInfo);
+        sbInfo.setId(sbModelSpareBomDTO.getSbId());
+        sbInfo = sbInfoMapper.selectByPrimaryKey(sbInfo);
         List<SbModelSpareBom> sbModelSpareBoms = new ArrayList<>();
-        if (sbInfos!=null&&sbInfos.size()==1){
+        if (sbInfo!=null){
             SbModelSpareBom bom = new SbModelSpareBom();
-            bom.setSbId(sbInfos.get(0).getId());
+            bom.setSbId(sbInfo.getId());
             sbModelSpareBoms = sbModelSpareBomMapper.select(bom);
         }else {
-            throw new BusinessException("位号有误,请查验!");
+            throw new BusinessException("系统有误,请查验!");
         }
-        return new R<>(sbModelSpareBoms);
+        List<String> spareIds = sbModelSpareBoms.stream().map(SbModelSpareBom::getSpareId).collect(Collectors.toList());
+        return new R<>(spareIds);
     }
 
   /**