From 8e4eee5ad4d74e1a4e6ab4de3a9c28000700dce0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:49:04 +0800
Subject: [PATCH] 修复采购退货页面 ERP 模块已禁用报错
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java
index c18d7f9..19ad7e6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java
@@ -4,8 +4,11 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
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.dv.subject.vo.MesDvSubjectImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectSaveReqVO;
@@ -13,6 +16,7 @@
import cn.iocoder.yudao.module.mes.service.dv.subject.MesDvSubjectService;
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;
@@ -20,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 static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -63,7 +69,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐐规淇濆吇椤圭洰")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
public CommonResult<MesDvSubjectRespVO> getSubject(@RequestParam("id") Long id) {
MesDvSubjectDO subject = subjectService.getSubject(id);
return success(BeanUtils.toBean(subject, MesDvSubjectRespVO.class));
@@ -71,7 +76,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐐规淇濆吇椤圭洰鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
public CommonResult<PageResult<MesDvSubjectRespVO>> getSubjectPage(@Valid MesDvSubjectPageReqVO pageReqVO) {
PageResult<MesDvSubjectDO> pageResult = subjectService.getSubjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesDvSubjectRespVO.class));
@@ -79,12 +83,36 @@
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱鐐规淇濆吇椤圭洰绮剧畝鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勪笅鎷夐�夐」")
- @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
public CommonResult<List<MesDvSubjectRespVO>> getSubjectSimpleList() {
List<MesDvSubjectDO> list = subjectService.getSubjectList();
return success(BeanUtils.toBean(list, MesDvSubjectRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱妫�淇爣鍑嗗鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<MesDvSubjectImportExcelVO> list = Collections.singletonList(
+ MesDvSubjectImportExcelVO.builder().code("JX-001").name("涓昏酱娓╁害妫�鏌�")
+ .type(1).content("妫�鏌ヤ富杞磋繍琛屾俯搴�").standard("娓╁害 鈮� 60鈩�")
+ .status(CommonStatusEnum.ENABLE.getStatus()).remark("绀轰緥鏁版嵁锛屽彲鍒犻櫎").build()
+ );
+ ExcelUtils.write(response, "妫�淇爣鍑嗗鍏ユā鏉�.xls", "妫�淇爣鍑�", MesDvSubjectImportExcelVO.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:dv-subject:import')")
+ public CommonResult<MesDvSubjectImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesDvSubjectImportExcelVO> list = ExcelUtils.read(file, MesDvSubjectImportExcelVO.class);
+ return success(subjectService.importSubjectList(list, updateSupport));
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鐐规淇濆吇椤圭洰 Excel")
@PreAuthorize("@ss.hasPermission('mes:dv-subject:export')")
--
Gitblit v1.9.3