From 81806860ff519555f494ac3c871dc92615d06cd4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 05 十一月 2026 20:15:47 +0800
Subject: [PATCH] feat(qc): 实现质检模板物料防重复选择功能
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
index 02335e9..220b264 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
@@ -3,6 +3,10 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportReqVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasurePageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
@@ -11,18 +15,21 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "绠＄悊鍚庡彴 - MDM 璁￠噺鍗曚綅")
@RestController
-@RequestMapping("/mdm/unit-measure")
+@RequestMapping("/mdm/unit")
@Validated
public class MdmUnitMeasureController {
@@ -66,23 +73,47 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璁￠噺鍗曚綅")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:query')")
public CommonResult<MdmUnitMeasureDO> getUnitMeasure(@RequestParam("id") Long id) {
return success(unitMeasureService.getUnitMeasure(id));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱璁￠噺鍗曚綅鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:query')")
public CommonResult<PageResult<MdmUnitMeasureDO>> getUnitMeasurePage(@Valid MdmUnitMeasurePageReqVO pageReqVO) {
return success(unitMeasureService.getUnitMeasurePage(pageReqVO));
}
@GetMapping("/list")
@Operation(summary = "鑾峰緱璁￠噺鍗曚綅鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:query')")
public CommonResult<List<MdmUnitMeasureDO>> getUnitMeasureList() {
return success(unitMeasureService.getUnitMeasureList(null));
}
-}
\ No newline at end of file
+ @GetMapping("/list-by-ids")
+ @Operation(summary = "鑾峰緱璁￠噺鍗曚綅鍒楄〃")
+ @Parameter(name = "ids", description = "缂栧彿鍒楄〃", required = true, example = "1,2,3")
+ public CommonResult<List<MdmUnitMeasureDO>> getUnitMeasureListByIds(@RequestParam("ids") List<Long> ids) {
+ return success(unitMeasureService.getUnitMeasureList(ids));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆璁￠噺鍗曚綅妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MdmUnitMeasureImportExcelVO> list = Arrays.asList(
+ MdmUnitMeasureImportExcelVO.builder().code("PCS").name("涓�").status(0).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "璁￠噺鍗曚綅瀵煎叆妯℃澘.xls", "璁￠噺鍗曚綅鍒楄〃", MdmUnitMeasureImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆璁￠噺鍗曚綅")
+ @PreAuthorize("@ss.hasPermission('mdm:unit-measure:import')")
+ public CommonResult<MdmUnitMeasureImportRespVO> importExcel(@Valid MdmUnitMeasureImportReqVO importReqVO)
+ throws Exception {
+ List<MdmUnitMeasureImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), MdmUnitMeasureImportExcelVO.class);
+ return success(unitMeasureService.importUnitMeasureList(list, importReqVO));
+ }
+
+}
--
Gitblit v1.9.3