From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java
index a1490b0..ca3f1e4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java
@@ -7,6 +7,8 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmSaveReqVO;
@@ -14,6 +16,7 @@
import cn.iocoder.yudao.module.mes.service.pd.techconfirm.ProductTechConfirmService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -21,8 +24,10 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -130,4 +135,30 @@
BeanUtils.toBean(list, ProductTechConfirmRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱浜у搧鎶�鏈‘璁ゅ嚱瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<ProductTechConfirmImportExcelVO> list = Collections.singletonList(
+ ProductTechConfirmImportExcelVO.builder()
+ .confirmNo("TC20260801001").customerName("姹熻嫃鍗庨箯鍙樺帇鍣ㄦ湁闄愬叕鍙�")
+ .productName("婕嗗寘鎵侀摐绾�").specification("QQNB-2/120")
+ .techParams("{\"thickness\":\"1.27\"}").templateType("general").remark("").build()
+ );
+ ExcelUtils.write(response, "浜у搧鎶�鏈‘璁ゅ嚱瀵煎叆妯℃澘.xls", "浜у搧鎶�鏈‘璁ゅ嚱鍒楄〃", ProductTechConfirmImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆浜у搧鎶�鏈‘璁ゅ嚱")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:import')")
+ public CommonResult<ProductTechConfirmImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<ProductTechConfirmImportExcelVO> list = ExcelUtils.read(file, ProductTechConfirmImportExcelVO.class);
+ return success(techConfirmService.importTechConfirmList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3