更新

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

@@ -514,16 +514,8 @@ public class PackingController {
             packingLog.setRemark("将名称从"+packingLibrary.getName()+"改为"+packingLibraryUpdateVo.getName());
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
-            //根据装备可见范围，配用范围，形态查询数据库
-//            List<PackingLibrary> byInvisibleRangeAndTypeAndName = packingLibraryDao.findByInvisibleRangeAndTypeAndName(packingLibraryUpdateVo.getInvisibleRange(), packingLibraryUpdateVo.getType(), packingLibraryUpdateVo.getName());
-//            if (byInvisibleRangeAndTypeAndName.size() >1){
-//                Map<String, Object> map = new HashMap<>();
-//                map.put("error","该装备的名称已经被占用了");
-//                return ResponseEntity.ok(map);
-//            }else {
-//                packingLibrary.setName(packingLibraryUpdateVo.getName());
-//                deviceLibraryDao.upDateName(packingLibrary.getName(),packingLibrary.getId());
-//            }
+            packingLibrary.setName(packingLibraryUpdateVo.getName());
+            deviceLibraryDao.upDateName(packingLibrary.getName(),packingLibrary.getId());
         }
         if (packingLibraryUpdateVo.getApplyType()!=null&&!packingLibraryUpdateVo.getApplyType().equals(packingLibrary.getApplyType())){
             //添加列装日志