From 1b602ba053af06651d5c8f50146866d98f82934c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 18 三月 2025 11:12:29 +0800 Subject: [PATCH] #修改 1.库位size字段,修改为长,宽, 高(完成 2.货架批量处理(完成 3.库位初始化功能(完成 4.筛选导出(完成 5.库位可绑定多种类型(中,高,低),可使用类型批量修改库位信息(完成 6.库位信息添加一个使用状态 (出库预约,入库预约,在库,空库,禁用, 空板)(完成 7.物料模板导出添加扩展字段 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java index 4d0887a..bf3a1de 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java @@ -107,8 +107,16 @@ @PreAuthorize("hasAuthority('manager:matnrGroup:list')") @PostMapping("/matnrGroup/tree") - public R tree(@RequestBody Map<String, Object> map) { - List<MatnrGroup> matnrs = matnrGroupService.list(new LambdaQueryWrapper<>()); + public R tree(@RequestBody(required = false) Map<String, Object> map) { + List<MatnrGroup> matnrs = new ArrayList<>(); + if (Objects.isNull(map)) { + matnrs = matnrGroupService.list(new LambdaQueryWrapper<>()); + } else { + if (Objects.isNull(map.get("condition"))) { + return R.ok("condition鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().like(MatnrGroup::getName, map.get("condition"))); + } List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren); return R.ok().add(treeData); } -- Gitblit v1.9.1