|
@@ -67,15 +67,16 @@ public class YjBjController {
|
67
|
67
|
@ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query"),
|
68
|
68
|
@ApiImplicitParam(name = "ch", value = "仓房ID", paramType = "query"),
|
69
|
69
|
@ApiImplicitParam(name = "hwh", value = "货位ID", paramType = "query"),
|
70
|
|
- @ApiImplicitParam(name = "lspz", value = "粮食品种ID", paramType = "query")
|
|
70
|
+ @ApiImplicitParam(name = "lspz", value = "粮食品种ID", paramType = "query"),
|
|
71
|
+ @ApiImplicitParam(name = "rksj", value = "入库时间", paramType = "query")
|
71
|
72
|
})
|
72
|
|
- public ResponseEntity<PageInfo<StorageRotationWarning>> getYlwlPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, Integer ch, Integer hwh, Integer lspz) {
|
|
73
|
+ public ResponseEntity<PageInfo<StorageRotationWarning>> getYlwlPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, Integer ch, Integer hwh, Integer lspz,String rksj) {
|
73
|
74
|
PageInfo<StorageRotationWarning> pageInfo = null;
|
74
|
75
|
try {
|
75
|
76
|
if (pageNum != null && pageSize != null) {
|
76
|
77
|
PageHelper.startPage(pageNum, pageSize);
|
77
|
78
|
}
|
78
|
|
- List<StorageRotationWarning> list = yjbjService.queryYlwlList(orgId, ch, hwh, lspz);
|
|
79
|
+ List<StorageRotationWarning> list = yjbjService.queryYlwlList(orgId, ch, hwh, lspz, rksj);
|
79
|
80
|
pageInfo = new PageInfo<>(list);
|
80
|
81
|
} catch (Exception e) {
|
81
|
82
|
log.error(e.getMessage(), e);
|