From a30a15f292e24f3e93253aec6dcc41b5cc3cc420 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期二, 31 十月 2023 11:27:40 +0800
Subject: [PATCH] feat: 盘点单/进出库流水总表/库存物品详情/物品仓库保管记录 实体类
---
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 99 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 33 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 c75352f..ca157b1 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,23 @@
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.base.util.FinSysTenantUtils;
import com.consum.model.po.BaseCategory;
+import com.consum.model.po.FinSysTenant;
+import com.consum.model.po.FinSysTenantUser;
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;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
+import java.util.*;
/**
* @Description 鐗╁搧鍒嗙被
@@ -30,6 +35,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 鏂板鍒嗙被
* @Author 鍗㈠簡闃�
@@ -44,34 +66,33 @@
return ResponseValue.error("椤哄簭鍙蜂负绌�");
}
//鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
- BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(param.getCategoryName(),param.getFatherCategoryId());
+ BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(param.getCategoryName(), param.getFatherCategoryId());
if (category != null) {
return ResponseValue.error("鍒嗙被鍚嶇О宸插瓨鍦�");
}
-// int result = this.baseCategoryService.add(param,this.getCurrentUser());
- int result = this.baseCategoryService.add(param);
- if(result>0) return ResponseValue.success(1);
+ int result = this.baseCategoryService.add(param, this.getCurrentUser());
+ if (result > 0) return ResponseValue.success(1);
return ResponseValue.error("鏂板澶辫触锛�");
}
/**
- * @Description 鐗╁搧鍒嗙被鍒楄〃鏌ヨ
+ * @Description 鐗╁搧鍒嗙被鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@GetMapping("/list")
public ResponseValue queryBaseCategoryList(BaseCategoryParam param) {
-// S_user_core currentUser = this.getCurrentUser();
-// if (currentUser == null) {
-// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-// }
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
GenericPager<BaseCategory> pager = this.baseCategoryService.queryBaseCategoryList(param);
return ResponseValue.success(pager);
}
/**
- * @Description 缂栬緫
+ * @Description 缂栬緫
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@@ -87,28 +108,24 @@
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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- // S_user_core currentUser = this.getCurrentUser();
-// if (currentUser == null) {
-// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-// }
int num = this.baseCategoryService.updateBaseCategory(baseCategory);
- return num>0 ? ResponseValue.success(1):ResponseValue.error("缂栬緫澶辫触锛�");
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
/**
* 淇敼鐘舵��
* @author 鍗㈠簡闃�
- * @date 2023/9/27
+ * @date 2023/10/23
*/
//鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
@PostMapping("/updStatus")
- public ResponseValue updateStatus(@RequestBody BaseCategory baseCategory){
- if (baseCategory==null || baseCategory.getId() ==null || baseCategory.getStates() == null) {
+ public ResponseValue updateStatus(@RequestBody BaseCategory baseCategory) {
+ if (baseCategory == null || baseCategory.getId() == null || baseCategory.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
//鏍规嵁鍒嗙被id鍜岀姸鎬佹煡璇㈢墿鍝佹ā鐗�
@@ -118,38 +135,54 @@
}
int num = this.baseCategoryService.updateStatus(baseCategory);
- return num>0 ? ResponseValue.success(1):ResponseValue.error("淇敼澶辫触锛�");
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("淇敼澶辫触锛�");
}
/**
- * @Description 鏍规嵁鑺傜偣id鍒犻櫎鑺傜偣(閫昏緫鍒犻櫎)
+ * @Description 鏍规嵁id鍒犻櫎鐗╁搧鍒嗙被
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@DeleteMapping("/del")
- public ResponseValue updateById(@RequestBody BaseCategory baseCategory){
+ public ResponseValue updateById(@RequestBody BaseCategory baseCategory) {
if (baseCategory.getId() == null) {
return ResponseValue.error("鍒嗙被id涓虹┖");
}
- //S_user_core currentUser = this.getCurrentUser();
- int num = this.baseCategoryService.updateById(baseCategory);
+ int num = this.baseCategoryService.updateById(baseCategory,this.getCurrentUser());
- return num>0 ? ResponseValue.success(1):ResponseValue.error("鍒犻櫎澶辫触锛�");
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
/**
- * 鏍规嵁鑺傜偣id鏌ヨ鑺傜偣璇︽儏
+ * 鏍规嵁鐗╁搧id鏌ヨ鑺傜偣璇︽儏
* @author 鍗㈠簡闃�
- * @date 2023/9/26
+ * @Date 2023/10/23
*/
@GetMapping("/detail")
- public ResponseValue getById(Long id){
+ public ResponseValue getById(Long id) {
if (id == null) {
return ResponseValue.error("鍒嗙被id涓虹┖");
}
BaseCategory baseCategory = this.baseCategoryService.getById(id);
if (baseCategory == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
- return ResponseValue.success("鏌ヨ鎴愬姛!",baseCategory);
+ 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