From 9bb18084093bdc0dabb614420d09e54c710d9b46 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 28 十一月 2023 14:34:45 +0800
Subject: [PATCH] feat: 出入库明细对接
---
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 94 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 80 insertions(+), 14 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 b975c77..4cea9f8 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
@@ -1,12 +1,15 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
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 org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +17,8 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
/**
* @Description 鐗╁搧鍒嗙被
@@ -30,13 +35,34 @@
@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 trees() {
+ List<ProjectTreeResult> tree = this.baseCategoryService.tree();
+ return ResponseValue.success(tree);
+ }
+
/**
* @Description 鏂板鍒嗙被
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody BaseCategoryParam param) {
+ public ResponseValue add() {
+ BaseCategoryParam param = CommonUtil.getObjFromReqBody(BaseCategoryParam.class);
+ BaseCategoryParam param2 = new BaseCategoryParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
if (StringUtils.isEmpty(param.getCategoryName())) {
return ResponseValue.error("鍒嗙被鍚嶇О涓虹┖");
}
@@ -50,7 +76,9 @@
}
int result = this.baseCategoryService.add(param, this.getCurrentUser());
- if (result > 0) return ResponseValue.success(1);
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
@@ -60,7 +88,12 @@
* @Date 2023/10/23
*/
@GetMapping("/list")
- public ResponseValue queryBaseCategoryList(BaseCategoryParam param) {
+ public ResponseValue queryBaseCategoryList() {
+ BaseCategoryParam param = CommonUtil.getObjFromReq(BaseCategoryParam.class);
+ BaseCategoryParam param2 = new BaseCategoryParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -69,13 +102,19 @@
return ResponseValue.success(pager);
}
+
/**
* @Description 缂栬緫
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@PostMapping("/edit")
- public ResponseValue edit(@RequestBody BaseCategory baseCategory) {
+ public ResponseValue edit() {
+ BaseCategory baseCategory = CommonUtil.getObjFromReqBody(BaseCategory.class);
+ BaseCategory param2 = new BaseCategory();
+ CommonUtil.copyProperties(baseCategory, param2);
+ baseCategory = param2;
+
Long id = baseCategory.getId();
if (id == null || id.longValue() <= 0) {
return ResponseValue.error("缂栬緫鐨勭墿鍝佸垎绫讳笉瀛樺湪");
@@ -86,11 +125,7 @@
if (baseCategory.getOrderNumber() == null) {
return ResponseValue.error("椤哄簭鍙蜂负绌�");
}
- //鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
- BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(baseCategory.getCategoryName(), baseCategory.getFatherCategoryId());
- if (category != null) {
- return ResponseValue.error("鍒嗙被鍚嶇О宸插瓨鍦�");
- }
+
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -101,12 +136,18 @@
/**
* 淇敼鐘舵��
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/23
*/
//鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
@PostMapping("/updStatus")
- public ResponseValue updateStatus(@RequestBody BaseCategory baseCategory) {
+ public ResponseValue updateStatus() {
+ BaseCategory baseCategory = CommonUtil.getObjFromReqBody(BaseCategory.class);
+ BaseCategory param2 = new BaseCategory();
+ CommonUtil.copyProperties(baseCategory, param2);
+ baseCategory = param2;
+
if (baseCategory == null || baseCategory.getId() == null || baseCategory.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
@@ -121,22 +162,28 @@
}
/**
- * @Description 鏍规嵁鑺傜偣id鍒犻櫎鑺傜偣(閫昏緫鍒犻櫎)
+ * @Description 鏍规嵁id鍒犻櫎鐗╁搧鍒嗙被
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@DeleteMapping("/del")
- public ResponseValue updateById(@RequestBody BaseCategory baseCategory) {
+ public ResponseValue updateById() {
+ BaseCategory baseCategory = CommonUtil.getObjFromReqBody(BaseCategory.class);
+ BaseCategory param2 = new BaseCategory();
+ CommonUtil.copyProperties(baseCategory, param2);
+ baseCategory = param2;
+
if (baseCategory.getId() == null) {
return ResponseValue.error("鍒嗙被id涓虹┖");
}
- int num = this.baseCategoryService.updateById(baseCategory,this.getCurrentUser());
+ int num = this.baseCategoryService.updateById(baseCategory, this.getCurrentUser());
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
/**
* 鏍规嵁鐗╁搧id鏌ヨ鑺傜偣璇︽儏
+ *
* @author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@@ -146,8 +193,27 @@
return ResponseValue.error("鍒嗙被id涓虹┖");
}
BaseCategory baseCategory = this.baseCategoryService.getById(id);
- if (baseCategory == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ 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