更新

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -287,7 +287,7 @@ public class PackingController {
     @ApiOperation(value = "配发设置区间")
     @PostMapping("/setAllotSeqs/{id}/{num}/{seq}")
     public ResponseEntity setAllotSeqs(@PathVariable("id") int id,@PathVariable("num") int num,@PathVariable("seq") String seq){
-        List<DeviceLibrary> deviceLibraries = packingLibraryService.getAllDevSeqs(id);
+        List<DeviceLibrary> deviceLibraries = packingLibraryService.getAllotDevSeqs(id);
         List<String> existSeqs = deviceLibraries.stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList());
         List<String> inputSeqs = DeviceSeqUtil.selectDeviceSeqs(seq);
         if (existSeqs.containsAll(inputSeqs)){

dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java

@@ -136,6 +136,8 @@ public interface PackingLibraryService {
 
     List<DeviceLibrary> getAllDevSeqs(Integer packingId);
 
+    List<DeviceLibrary> getAllotDevSeqs(Integer packingId);
+
     Boolean modelIsExist(String model);
 
     /**

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -525,6 +525,15 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         return deviceLibraryDao.findAll(predicateBuilder.build());
     }
 
+    @Override
+    public List<DeviceLibrary> getAllotDevSeqs(Integer packingId) {
+        PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
+        predicateBuilder.eq("ownUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder.eq("lifeStatus", 2);
+        predicateBuilder.eq("packingId", packingId);
+        return deviceLibraryDao.findAll(predicateBuilder.build());
+    }
+
     @Override
     public Boolean modelIsExist(String model) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();