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