From 687e4da4b6fb9147b12eb0cd5072e1dda02abc00 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 19 六月 2025 16:11:44 +0800 Subject: [PATCH] no message --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java index d64be92..8d63180 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java @@ -40,8 +40,6 @@ private DeliveryItemService deliveryItemService; @Autowired private CompanysService companysService; - @Autowired - private DeliveryServiceImpl deliveryService; @PreAuthorize("hasAuthority('manager:deliveryItem:list')") @PostMapping("/deliveryItem/page") @@ -49,10 +47,42 @@ BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class); QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true); + return R.ok().add(deliveryItemService.page(pageParam, wrapper)); + } + + @PreAuthorize("hasAuthority('manager:deliveryItem:list')") + @PostMapping("/deliveryItem/filters/page") + public R filter(@RequestBody Map<String, Object> map) { + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class); + QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true); wrapper.apply("anfme > work_qty + qty "); return R.ok().add(deliveryItemService.page(pageParam, wrapper)); } + + @PreAuthorize("hasAuthority('manager:deliveryItem:list')") + @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃") + @PostMapping("/deliveryItem/edit/page") + public R byPoIdspage(@RequestBody Map<String, Object> map) { + List<Long> poDetlIds = new ArrayList<>(); + if (!Objects.isNull(map.get("ids"))) { + poDetlIds = JSONArray.parseArray(JSONArray.toJSONString(map.get("ids")), Long.class); + map.remove("ids"); + } + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class); + QueryWrapper<DeliveryItem> queryWrapper = pageParam.buildWrapper(true); + if (!poDetlIds.isEmpty()) { + queryWrapper.in("id", poDetlIds); + } else { + return R.ok(); + } + return R.ok().add(deliveryItemService.page(pageParam, queryWrapper)); + } + + + @PreAuthorize("hasAuthority('manager:deliveryItem:list')") @PostMapping("/deliveryItem/list") public R list(@RequestBody Map<String, Object> map) { -- Gitblit v1.9.1