From f3cced9eaeb9d13e4e86270e7191d8966cedb039 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 27 Sep 2024 18:49:48 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8C=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/DistributionSignforAppController.java | 2 +- .../WarehouseWarehousingEntryController.java | 25 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java index f899bd102..4b796d042 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java @@ -65,7 +65,7 @@ public class DistributionSignforAppController { } /** - * 签收管理 列表 + * 回库任务 列表 */ @GetMapping("/newPage") @ApiOperationSupport(order = 1) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java index bf3902ed5..25d3002e6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java @@ -97,17 +97,36 @@ public class WarehouseWarehousingEntryController extends BladeController { /** * 仓库入库单 分页 */ - @GetMapping("/list") + @PostMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入warehouseWarehousingEntry") - public R> list(@ApiIgnore @RequestParam Map warehouseWarehousingEntry, Query query) { + public R> list(@ApiIgnore @RequestBody Map request) { //获取当前登录人仓库 List myWarehouseList = basicdataWarehouseClient.getMyWatchWarehouse(); List collect = myWarehouseList.stream() .map(BasicdataWarehouseEntity::getId) .collect(Collectors.toList()); + + + Map warehouseWarehousingEntry = (Map) request.get("warehouseWarehousingEntry"); + + String receiptDateStart = (String) warehouseWarehousingEntry.get("receiptDateStart"); + String receiptDateStartEnd = (String) warehouseWarehousingEntry.get("receiptDateStartEnd"); + warehouseWarehousingEntry.remove("receiptDateStart"); + warehouseWarehousingEntry.remove("receiptDateStartEnd"); + + + Map queryMap = (Map) request.get("query"); + Query query = new Query(); + query.setSize((Integer) queryMap.get("size")); + query.setCurrent((Integer) queryMap.get("current")); + + QueryWrapper queryWrapper = Condition.getQueryWrapper(warehouseWarehousingEntry, WarehouseWarehousingEntryEntity.class); - queryWrapper.lambda().in(collect.size()>0,WarehouseWarehousingEntryEntity::getWarehouseId,collect); + queryWrapper.lambda().in(!collect.isEmpty(),WarehouseWarehousingEntryEntity::getWarehouseId,collect); + if(receiptDateStart != null && receiptDateStartEnd != null){ + queryWrapper.lambda().between(WarehouseWarehousingEntryEntity::getReceiptDate, receiptDateStart+" 00:00:00", receiptDateStartEnd+" 23:59:59"); + } IPage pages = warehouseWarehousingEntryService.page(Condition.getPage(query), queryWrapper); return R.data(pages); }