| | |
| | | param.remove("modi_time"); |
| | | } |
| | | } |
| | | param.remove("curr"); |
| | | param.remove("limit"); |
| | | EntityWrapper<LocDetl> wrapper = new EntityWrapper<>(); |
| | | convert(param, wrapper); |
| | | // 不同继承角色显示不同库信息 |
| | | RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper); |
| | | Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper); |
| | | if (locDetlPage.getRecords().size()==0){ |
| | | locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper); |
| | | Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)); |
| | | if (stockOut.getRecords().size()==0){ |
| | | stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class)); |
| | | } |
| | | return R.ok(locDetlPage); |
| | | return R.ok(stockOut); |
| | | } |
| | | |
| | | @RequestMapping(value = "/stock/out/crn/list/auth") |