From 332c012e7336f2996c4fe5c8c110d00713c1bde2 Mon Sep 17 00:00:00 2001 From: haoyahui <2032914783@qq.com> Date: 星期六, 11 十一月 2023 18:51:33 +0800 Subject: [PATCH] 采购单,采购明细,库存管理,出入库,调拨管理,库存盘点 --- consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 3 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java index 2603a6b..bfb806f 100644 --- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java +++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java @@ -2,18 +2,26 @@ import com.consum.base.BaseController; import com.consum.base.pojo.BaseCategoryParam; +import com.consum.base.pojo.ProjectTreeResult; import com.consum.base.service.BaseCategoryServiceImpl; import com.consum.base.service.BaseGoodsTemplateServiceImpl; import com.consum.model.po.BaseCategory; import com.iplatform.model.po.S_user_core; import com.walker.db.page.GenericPager; +import com.walker.infrastructure.tree.TreeNode; import com.walker.infrastructure.utils.StringUtils; import com.walker.web.ResponseValue; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @Description 鐗╁搧鍒嗙被 @@ -29,6 +37,23 @@ @Autowired private BaseGoodsTemplateServiceImpl baseGoodsTemplateService; + + private boolean multiRoot = true; + private TreeNode dummyRoot = null; + private Map<Long, TreeNode> rootMap = new TreeMap(); + private Map<Long, TreeNode> childMap = new TreeMap(); + private long defaultParentId = 0L; + + /** + * @Description 鑾峰彇鍒嗙被鏍� + * @Author 鍗㈠簡闃� + * @Date 2023/10/30 + */ + @GetMapping("/select/tree") + public ResponseValue tree(String categoryName) { + List<ProjectTreeResult> tree = this.baseCategoryService.tree(categoryName); + return ResponseValue.success(tree); + } /** * @Description 鏂板鍒嗙被 @@ -68,6 +93,7 @@ GenericPager<BaseCategory> pager = this.baseCategoryService.queryBaseCategoryList(param); return ResponseValue.success(pager); } + /** * @Description 缂栬緫 @@ -145,5 +171,22 @@ if (baseCategory == null) return ResponseValue.error("鏌ヨ澶辫触锛�"); return ResponseValue.success("鏌ヨ鎴愬姛!", baseCategory); } + + /** + * @Description 涓夌骇鍒嗙被鍒楄〃鏌ヨ + * @Author 鍗㈠簡闃� + * @Date 2023/10/24 + */ + @GetMapping("/select/lv3_tree") + public ResponseValue tree() { + S_user_core currentUser = this.getCurrentUser(); + if (currentUser == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + + List<BaseCategory> baseCategories = this.baseCategoryService.queryForLv3Tree(); + return ResponseValue.success(baseCategories); + } + } -- Gitblit v1.9.1