From 4864c87d65e797d2ecd827b1eca9d46aec0950aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 7860618..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;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -55,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);
}
--
Gitblit v1.9.3