From 4788f8d86807296a3dce75b5dd428c0a8d5828db Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 25 七月 2025 17:12:39 +0800
Subject: [PATCH] 分类字典设置上级是否存在子节点修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java
index 30cb336..4431a7d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java
@@ -9,6 +9,8 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.eam.entity.EamSparePartReceiveDetail;
+import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail;
+import org.jeecg.modules.eam.entity.EamSpareParts;
import org.jeecg.modules.eam.service.IEamSparePartReceiveDetailService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,6 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.eam.service.IEamSparePartsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -37,6 +40,9 @@
@Resource
private IEamSparePartReceiveDetailService eamSparePartReceiveDetailService;
+ @Resource
+ private IEamSparePartsService eamSparePartsService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -46,7 +52,6 @@
* @param req
* @return
*/
- @AutoLog(value = "棰嗙敤鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "棰嗙敤鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes = "棰嗙敤鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<?> queryPageList(EamSparePartReceiveDetail eamSparePartReceiveDetail,
@@ -56,6 +61,14 @@
QueryWrapper<EamSparePartReceiveDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartReceiveDetail, req.getParameterMap());
Page<EamSparePartReceiveDetail> page = new Page<EamSparePartReceiveDetail>(pageNo, pageSize);
IPage<EamSparePartReceiveDetail> pageList = eamSparePartReceiveDetailService.page(page, queryWrapper);
+ for (EamSparePartReceiveDetail record : pageList.getRecords()) {
+ String partId = record.getPartId();
+ EamSpareParts part = eamSparePartsService.getById(partId);
+ record.setPartCode(part.getPartCode());
+ record.setPartName(part.getPartName());
+ record.setPartModel(part.getPartModel());
+ record.setPartSpecification(part.getPartSpecification());
+ }
return Result.OK(pageList);
}
@@ -65,7 +78,6 @@
* @param eamSparePartReceiveDetail
* @return
*/
- @AutoLog(value = "棰嗙敤鍗曟槑缁�-娣诲姞")
@ApiOperation(value = "棰嗙敤鍗曟槑缁�-娣诲姞", notes = "棰嗙敤鍗曟槑缁�-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamSparePartReceiveDetail eamSparePartReceiveDetail) {
@@ -79,7 +91,6 @@
* @param eamSparePartReceiveDetail
* @return
*/
- @AutoLog(value = "棰嗙敤鍗曟槑缁�-缂栬緫")
@ApiOperation(value = "棰嗙敤鍗曟槑缁�-缂栬緫", notes = "棰嗙敤鍗曟槑缁�-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamSparePartReceiveDetail eamSparePartReceiveDetail) {
@@ -93,7 +104,6 @@
* @param id
* @return
*/
- @AutoLog(value = "棰嗙敤鍗曟槑缁�-閫氳繃id鍒犻櫎")
@ApiOperation(value = "棰嗙敤鍗曟槑缁�-閫氳繃id鍒犻櫎", notes = "棰嗙敤鍗曟槑缁�-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
@@ -107,7 +117,6 @@
* @param ids
* @return
*/
- @AutoLog(value = "棰嗙敤鍗曟槑缁�-鎵归噺鍒犻櫎")
@ApiOperation(value = "棰嗙敤鍗曟槑缁�-鎵归噺鍒犻櫎", notes = "棰嗙敤鍗曟槑缁�-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
@@ -121,7 +130,6 @@
* @param id
* @return
*/
- @AutoLog(value = "棰嗙敤鍗曟槑缁�-閫氳繃id鏌ヨ")
@ApiOperation(value = "棰嗙敤鍗曟槑缁�-閫氳繃id鏌ヨ", notes = "棰嗙敤鍗曟槑缁�-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
--
Gitblit v1.9.3