bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

总包有量可以点击查看编码设备

This commit is contained in:
liang.chao 2024-11-20 18:08:21 +08:00
parent d4d20747ff
commit 6b632e0158
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java
View File

@ -25,10 +25,10 @@ import java.util.List;
import java.util.Set; import java.util.Set;
/** /**
* @description 综合查询--机具仓储状态查询 * @author hay
* @author hay * @description 综合查询--机具仓储状态查询
* @date 2024/2/26 14:15 * @date 2024/2/26 14:15
*/ */
@Api(tags = "综合查询--机具仓储状态查询") @Api(tags = "综合查询--机具仓储状态查询")
@RestController @RestController
@RequestMapping("/storageStatus") @RequestMapping("/storageStatus")
@ -56,8 +56,7 @@ public class StorageStatusController extends BaseController {
@ApiOperation("导出综合查询机具仓储状态查询列表") @ApiOperation("导出综合查询机具仓储状态查询列表")
@Log(title = "导出综合查询机具仓储状态查询列表", businessType = BusinessType.EXPORT) @Log(title = "导出综合查询机具仓储状态查询列表", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, StorageStatus bean) public void export(HttpServletResponse response, StorageStatus bean) {
{
List<StorageStatus> list = storageStatusService.getStorageStatusList(bean); List<StorageStatus> list = storageStatusService.getStorageStatusList(bean);
ExcelUtil<StorageStatus> util = new ExcelUtil<>(StorageStatus.class); ExcelUtil<StorageStatus> util = new ExcelUtil<>(StorageStatus.class);
util.exportExcel(response, list, "综合查询--工程机具使用"); util.exportExcel(response, list, "综合查询--工程机具使用");
@ -73,6 +72,7 @@ public class StorageStatusController extends BaseController {
List<MaType> list = storageStatusMapper.getMaCodeList(bean); List<MaType> list = storageStatusMapper.getMaCodeList(bean);
return AjaxResult.success(getDataTable(list)); return AjaxResult.success(getDataTable(list));
} }
/** /**
* 查询机具编码 * 查询机具编码
*/ */
@ -91,6 +91,7 @@ public class StorageStatusController extends BaseController {
@ApiOperation(value = "综合查询--获取总保有量编码设备详情") @ApiOperation(value = "综合查询--获取总保有量编码设备详情")
@GetMapping("/getAllRecords") @GetMapping("/getAllRecords")
public AjaxResult getAllRecords(StorageStatus bean) { public AjaxResult getAllRecords(StorageStatus bean) {
List<MaType> list = new ArrayList<>();
List<Integer> maIds = new ArrayList<>(); List<Integer> maIds = new ArrayList<>();
// 获取在库maid // 获取在库maid
List<Integer> zkids = storageStatusMapper.getzk(bean); List<Integer> zkids = storageStatusMapper.getzk(bean);
@ -105,8 +106,12 @@ public class StorageStatusController extends BaseController {
maIds.addAll(zxids); maIds.addAll(zxids);
maIds.addAll(xshdrkids); maIds.addAll(xshdrkids);
Set<Integer> ids = new HashSet<>(maIds); Set<Integer> ids = new HashSet<>(maIds);
startPage(); if (ids.size() > 0) {
List<MaType> list = storageStatusMapper.getAllRecords(ids,bean); startPage();
return AjaxResult.success(getDataTable(list)); list = storageStatusMapper.getAllRecords(ids, bean);
return AjaxResult.success(getDataTable(list));
} else {
return AjaxResult.success(getDataTable(list));
}
} }
} }