From 07363413e7d36618ebafe658baebab8a9172be91 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 28 二月 2025 13:32:24 +0800 Subject: [PATCH] #修改 1. 物料分类接口新增筛选条件 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 12 ++++++++++-- rsf-admin/src/i18n/en.js | 34 +++++++++++++++++----------------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js index f45f6df..78925e2 100644 --- a/rsf-admin/src/i18n/en.js +++ b/rsf-admin/src/i18n/en.js @@ -318,21 +318,21 @@ locAttrs: "LocAttrs", }, container: { - code: "code", - name: "name", - typeId: "typeId", - used: "used", - lenght: "lenght", - width: "width", - height: "height", - rstLen: "rstLen", - rstWid: "rstWid", - rstWei: "rstWei", - rstHei: "rstHei", - panrentId: "panrentId", - vaildTime: "vaildTime", - flagRycle: "flagRycle", - flagLogic: "flagLogic", + code: "Code", + name: "Name", + typeId: "TypeId", + used: "Used", + lenght: "Lenght", + width: "Width", + height: "Height", + rstLen: "RstLen", + rstWid: "RstWid", + rstWei: "RstWei", + rstHei: "RstHei", + panrentId: "PanrentId", + vaildTime: "VaildTime", + flagRycle: "FlagRycle", + flagLogic: "FlagLogic", }, contract: { code: "Code", @@ -340,8 +340,8 @@ projectName: "ProjectName", }, qlyInspect: { - code: "code", - name: "name", + code: "Code", + name: "Name", }, dictType: { code: "Code", 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 bde419b..26d45fe 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() { - List<MatnrGroup> matnrs = matnrGroupService.list(new LambdaQueryWrapper<>()); + public R tree(@RequestBody 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