feat(装备模块，盘存模块): 新增了返回库房,以及状态的过滤

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -22,6 +22,7 @@ import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo;
 import com.tykj.dev.device.library.subject.model.vo.UpdatePostionMessageVO;
 import com.tykj.dev.device.library.subject.vo.*;
 import com.tykj.dev.device.library.utils.DeviceNumberUtils;
+import com.tykj.dev.device.user.cache.StoreCache;
 import com.tykj.dev.device.user.cache.UnitsCache;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.service.UnitsService;
@@ -93,6 +94,9 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     @Resource
     private DeviceLibraryPositionService deviceLibraryPositionService;
 
+    @Resource
+    private StoreCache storeCache;
+
     @Override
     @UpdateCache
     public DeviceLibrary addEntity(DeviceLibrary deviceLibraryEntity) {
@@ -1304,13 +1308,6 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();
         BeanUtils.copyProperties(queryTheWarehouseVo,deviceLibrarySelectVo);
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(deviceLibrarySelectVo);
-//        Specification<DeviceLibrary> or = null;
-//        if (deviceLibrarySelectVo.getNonStorageLocationId()!=null){
-//
-//          or = predicateBuilder.build().or(getPredicateBuilder2(deviceLibrarySelectVo).build());
-//        }else {
-//            or = predicateBuilder.build();
-//        }
         StopWatch stopWatch = new StopWatch("条件查询结果集");
         stopWatch.start();
         List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build());
@@ -1376,11 +1373,15 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 collect.stream().map(DeviceLibrary::getName).distinct().collect(Collectors.toList());
         List<String> ownUnits =
                 collect.stream().map(DeviceLibrary::getOwnUnit).distinct().collect(Collectors.toList());
+        List<Integer> storageLocationIds = collect.stream().map(DeviceLibrary::getStorageLocationId).distinct().collect(Collectors.toList());
+        Map<Integer, String> idMap = storeCache.getIdMap();
         map.put("allVOPage",allVOPage);
         map.put("models",models);
         map.put("seqNumberList",seqNumberList);
         map.put("names",names);
         map.put("ownUnits",ownUnits);
+        map.put("storageLocation",storageLocationIds.stream().map(integer -> new StorageLocationVo(integer,idMap.getOrDefault(integer,null)))
+                .collect(Collectors.toList()));
         return map;
     }
 

dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/service/WarehouseInspectionServiceImpl.java

@@ -106,9 +106,11 @@ public class WarehouseInspectionServiceImpl implements WarehouseInspectionServic
         PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
         predicateBuilder.eq("ownUnit",currentUserUnitName);
         predicateBuilder.eq("locationUnit",currentUserUnitName);
+        List<Integer> statusList = new ArrayList<>(Arrays.asList(5,11,12));
         List<DeviceLibrary> allDevices = deviceLibraryService.findAllDevices().stream()
                 .filter(deviceLibrary -> deviceLibrary.getOwnUnit().equals(currentUserUnitName)
-                        && deviceLibrary.getLocationUnit().equals(currentUserUnitName)).collect(Collectors.toList());
+                        && deviceLibrary.getLocationUnit().equals(currentUserUnitName)
+                && !statusList.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList());
         allDevices.forEach(deviceLibrary -> deviceLibrary.setStatus(0));
         return allDevices;
     }