仓库报表

platform-service/src/main/java/com/platform/service/store/impl/SpareStoreServiceImpl.java

@@ -175,15 +175,23 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
             model.setUseCompany(list.get(0).getDeptId());
         }*/
         // 查询设备型号下面的备件
+        if (StringUtils.isNotEmpty(model.getModel())) {
+            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+            sbModelDTO.setKeyword(model.getModel());
+            List<SbModelSpareBomVO> modelList = sbModelSpareBomService.selectVOList(sbModelDTO);
+            List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
+            model.setSpareIdList(spareList);
+        }
 
-        if(model.getIsSpecial()==1) {
-            if (StringUtils.isNotEmpty(model.getModel())) {
-                SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
-                sbModelDTO.setKeyword(model.getModel());
-                List<SbModelSpareBomVO> modelList = sbModelSpareBomService.selectVOList(sbModelDTO);
-                List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
-                model.setSpareIdList(spareList);
+        if(model.getIsSpecial()!=null&&model.getIsSpecial()==1) {
+            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+            sbModelDTO.setSbId(model.getSbId());
+            List<SbModelSpareBomVO> modelList = sbModelSpareBomService.selectVOList(sbModelDTO);
+            if(modelList != null && modelList.size()==0){
+                return new MyPage<>(null);
             }
+            List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
+            model.setSpareIdList(spareList);
         }
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage<>(mapper.selectList(model));