From fb5aa087eaf6a68cf7ea8114beb270551016e7dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 11:27:45 +0800
Subject: [PATCH] 添加定型指派设备
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
index 035593e..377f682 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
@@ -8,7 +8,9 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.eam.entity.EamSparePartInventory;
import org.jeecg.modules.eam.entity.EamSpareParts;
+import org.jeecg.modules.eam.service.IEamSparePartInventoryService;
import org.jeecg.modules.eam.service.IEamSparePartsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,6 +39,9 @@
@Resource
private IEamSparePartsService eamSparePartsService;
+ @Autowired
+ private IEamSparePartInventoryService eamSparePartInventoryService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -46,7 +51,6 @@
* @param req
* @return
*/
- @AutoLog(value = "澶囧搧澶囦欢绠＄悊-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "澶囧搧澶囦欢绠＄悊-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囧搧澶囦欢绠＄悊-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<?> queryPageList(EamSpareParts eamSpareParts,
@@ -56,6 +60,12 @@
QueryWrapper<EamSpareParts> queryWrapper = QueryGenerator.initQueryWrapper(eamSpareParts, req.getParameterMap());
Page<EamSpareParts> page = new Page<EamSpareParts>(pageNo, pageSize);
IPage<EamSpareParts> pageList = eamSparePartsService.page(page, queryWrapper);
+ for (EamSpareParts record : pageList.getRecords()) {
+ QueryWrapper<EamSparePartInventory> wrapper = new QueryWrapper<>();
+ wrapper.eq("spare_part_id",record.getId()).select("sum(inventory) as inventory");
+ EamSparePartInventory one = eamSparePartInventoryService.getOne(wrapper);
+ record.setTotalQuantity(one.getInventory().toString());
+ }
return Result.OK(pageList);
}
@@ -65,7 +75,6 @@
* @param eamSpareParts
* @return
*/
- @AutoLog(value = "澶囧搧澶囦欢绠＄悊-娣诲姞")
@ApiOperation(value = "澶囧搧澶囦欢绠＄悊-娣诲姞", notes = "澶囧搧澶囦欢绠＄悊-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamSpareParts eamSpareParts) {
@@ -79,7 +88,6 @@
* @param eamSpareParts
* @return
*/
- @AutoLog(value = "澶囧搧澶囦欢绠＄悊-缂栬緫")
@ApiOperation(value = "澶囧搧澶囦欢绠＄悊-缂栬緫", notes = "澶囧搧澶囦欢绠＄悊-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamSpareParts eamSpareParts) {
@@ -93,7 +101,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 +114,6 @@
* @param ids
* @return
*/
- @AutoLog(value = "澶囧搧澶囦欢绠＄悊-鎵归噺鍒犻櫎")
@ApiOperation(value = "澶囧搧澶囦欢绠＄悊-鎵归噺鍒犻櫎", notes = "澶囧搧澶囦欢绠＄悊-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
@@ -121,7 +127,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