From 25bdb3fa20edd3b09611ccd5d19244d4e7264ab0 Mon Sep 17 00:00:00 2001
From: lead <lead@local>
Date: 星期二, 03 十一月 2026 10:09:31 +0800
Subject: [PATCH] fix(kyzn): 物料新增 500 —— 修复 MES 物料分类编码重复导致 selectOne 抛 TooManyResultsException
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
index 5895cff..d13e246 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
@@ -19,8 +19,20 @@
@RequestMapping("/energy/record")
@Validated
public class EnergyRecordController {
+ @Resource private cn.iocoder.yudao.module.mes.service.energy.EnergyExportService energyExportService;
@Resource(name = "energyRecordService")
private EnergyRecordService energyRecordService;
+
+ @GetMapping("/export-excel")
+ @PreAuthorize("@ss.hasPermission('energy:record:export')")
+ public void export(@Valid EnergyRecordPageReqVO req, jakarta.servlet.http.HttpServletResponse response) throws java.io.IOException {
+ energyExportService.records(req, response);
+ }
+ @GetMapping("/analysis-export")
+ @PreAuthorize("@ss.hasPermission('energy:analysis:export')")
+ public void exportAnalysis(@Valid EnergyAnalysisReqVO req, jakarta.servlet.http.HttpServletResponse response) throws java.io.IOException {
+ energyExportService.analysis(req, response);
+ }
@PostMapping("/create")
@Operation(summary = "鎵嬪姩鏂板鑳借�楄褰�")
@@ -49,7 +61,11 @@
@Operation(summary = "鏌ョ湅鑳借�楄褰�")
@PreAuthorize("@ss.hasPermission('energy:record:query')")
public CommonResult<EnergyRecordRespVO> get(@RequestParam("id") Long id) {
- return success(BeanUtils.toBean(energyRecordService.get(id), EnergyRecordRespVO.class));
+ var record = energyRecordService.get(id);
+ if (record == null) {
+ return success(null);
+ }
+ return success(BeanUtils.toBean(record, EnergyRecordRespVO.class));
}
@GetMapping("/page")
--
Gitblit v1.9.3