更新

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -143,7 +143,7 @@ public class DeviceLibraryController {
         List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build());
         deviceLibraries.forEach(DeviceLibrary::setConfigName);
         List<DeviceLibrary> deviceLibraryEntities = deviceLibraries.stream()
-                .filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(unit))
+                .filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(unit)&&(deviceLibrary.getLifeStatus()==2||deviceLibrary.getLifeStatus()==14))
                 .collect(Collectors.toList());
         deviceLibraries.removeAll(deviceLibraryEntities);
         Map<String,Object> map = new HashMap<>();

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

@@ -162,19 +162,19 @@ public class PackingController {
     @PostMapping("/add")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addPack(@RequestBody @Validated AddPack addPack){
-        if (!packingLibraryService.hasSamePack(addPack.getPartParentId(),addPack.getType(),addPack.getStyle(),addPack.getName(),addPack.getSecretLevel(),addPack.getInvisibleRange())) {
-            if (packingLibraryService.nameIsExist(addPack.getModel(), addPack.getName())) {
+        if (packingLibraryService.hasSamePack(addPack.getPartParentId(),addPack.getType(),addPack.getStyle(),addPack.getName(),addPack.getSecretLevel(),addPack.getInvisibleRange())) {
+//            if (packingLibraryService.nameIsExist(addPack.getModel(), addPack.getName())) {
+//                Map<String, Object> map = new HashMap<>();
+//                map.put("error", "型号" + addPack.getModel() + "下名称为" + addPack.getName() + "的装备已存在");
+//                return ResponseEntity.ok(map);
+//            }
+            Boolean matchingRangeIsExist = packingLibraryService.matchingRangeIsExist(addPack.getPartParentId(), addPack.getMatchingRange(), addPack.getType(), addPack.getStyle(), addPack.getName(), addPack.getSecretLevel(), addPack.getInvisibleRange());
+            if (matchingRangeIsExist) {
                 Map<String, Object> map = new HashMap<>();
-                map.put("error", "型号" + addPack.getModel() + "下名称为" + addPack.getName() + "的装备已存在");
+                map.put("error", "型号" + addPack.getModel() + "下配用范围为" + configCache.getMatchingRangeMap().get(addPack.getMatchingRange()) + "的该装备已存在");
                 return ResponseEntity.ok(map);
             }
         }
-        Boolean matchingRangeIsExist = packingLibraryService.matchingRangeIsExist(addPack.getPartParentId(),addPack.getMatchingRange(),addPack.getType(),addPack.getStyle(),addPack.getName(),addPack.getSecretLevel(),addPack.getInvisibleRange());
-        if (matchingRangeIsExist){
-            Map<String,Object> map = new HashMap<>();
-            map.put("error","型号"+addPack.getModel()+"下配用范围为"+configCache.getMatchingRangeMap().get(addPack.getMatchingRange())+"的该装备已存在");
-            return ResponseEntity.ok(map);
-        }
         PackingLibrary packingLibrary = addPack.toDo();
         PackingLibrary packingLibrary1 = packingLibraryService.getOne(addPack.getPartParentId());
 //        TaskBto taskBto = new TaskBto(StatusEnum.END.id, "列装业务", null, ".", packingLibrary1.getId(), 1, userUtils.getCurrentUnitId(), 0, null, Collections.singletonList(userUtils.getCurrentUserId()));