Browse Source

同上

master
xia 3 years ago
parent
commit
0e11fc0bc0
  1. 9
      archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java
  2. 6
      storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java
  3. 2
      storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java
  4. 6
      storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java

9
archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java

@ -1,5 +1,6 @@
package com.storeroom.modules.archives.controller; package com.storeroom.modules.archives.controller;
import com.storeroom.annotaion.rest.AnonymousGetMapping;
import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.utils.enums.ResponseStatus;
import com.storeroom.modules.archives.service.ArchivesCaseService; import com.storeroom.modules.archives.service.ArchivesCaseService;
import com.storeroom.modules.archives.service.dto.ArchivesCaseCartoningDTO; import com.storeroom.modules.archives.service.dto.ArchivesCaseCartoningDTO;
@ -30,6 +31,14 @@ public class CaseController {
return ApiResponse.success(caseService.initCaseList(tid,caseName,barcode,page)); return ApiResponse.success(caseService.initCaseList(tid,caseName,barcode,page));
} }
@ApiOperation("获取全部档案盒")
@AnonymousGetMapping("/initCaseAll")
public ApiResponse<Object> initCaseAll(
Pageable page
){
return ApiResponse.success(caseService.initCaseAll(page));
}
@ApiOperation("档案盒名称是否重复") @ApiOperation("档案盒名称是否重复")
@GetMapping("/caseNameIsRepeat") @GetMapping("/caseNameIsRepeat")
public ApiResponse<Object> caseNameIsRepeat( public ApiResponse<Object> caseNameIsRepeat(

6
storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java

@ -37,4 +37,10 @@ public class DeviceController {
} }
return ApiResponse.success(deviceService.queryAll(pageable)); return ApiResponse.success(deviceService.queryAll(pageable));
} }
@ApiOperation("获取储存设备列表")
@AnonymousGetMapping("storageDevice")
public ApiResponse<Object> storageDevice(Pageable pageable) {
return ApiResponse.success(deviceService.queryStorageDeviceAll(pageable));
}
} }

2
storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java

@ -122,5 +122,7 @@ public interface DeviceService {
*/ */
DeviceInfoDto findById(String id); DeviceInfoDto findById(String id);
//获取储存设备列表
Object queryStorageDeviceAll(Pageable pageable);
} }

6
storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java

@ -305,6 +305,12 @@ public class DeviceImpl implements DeviceService {
return deviceInfoMapper.toDto(deviceInfo); return deviceInfoMapper.toDto(deviceInfo);
} }
@Override
public Object queryStorageDeviceAll(Pageable pageable) {
Page<DeviceInfo> page = deviceInfoRepository.queryStorageDeviceAll(pageable);
return PageUtil.toPage(page.map(deviceInfoMapper::toDto));
}
/** /**
* 生成架位左右位置 * 生成架位左右位置

Loading…
Cancel
Save