From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
index 8362b7f..155e495 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.wm.outsourceissue.vo.MesWmOutsourceIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueSaveReqVO;
@@ -19,6 +21,7 @@
import cn.iocoder.yudao.module.mes.service.wm.outsourceissue.MesWmOutsourceIssueService;
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;
@@ -26,6 +29,7 @@
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;
@@ -76,7 +80,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱澶栧崗鍙戞枡鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
public CommonResult<MesWmOutsourceIssueRespVO> getOutsourceIssue(@RequestParam("id") Long id) {
MesWmOutsourceIssueDO issue = outsourceIssueService.getOutsourceIssue(id);
if (issue == null) {
@@ -87,7 +90,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱澶栧崗鍙戞枡鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
public CommonResult<PageResult<MesWmOutsourceIssueRespVO>> getOutsourceIssuePage(
@Valid MesWmOutsourceIssuePageReqVO pageReqVO) {
PageResult<MesWmOutsourceIssueDO> pageResult = outsourceIssueService.getOutsourceIssuePage(pageReqVO);
@@ -145,11 +147,38 @@
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙澶栧崗鍙戞枡鍗曟暟閲�", description = "鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛屽彂鏂欐暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
public CommonResult<Boolean> checkOutsourceIssueQuantity(@RequestParam("id") Long id) {
return success(outsourceIssueService.checkOutsourceIssueQuantity(id));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱澶栧崗鍙戞枡鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmOutsourceIssueImportExcelVO> list = Collections.singletonList(
+ MesWmOutsourceIssueImportExcelVO.builder()
+ .code("WOS20260302001").name("绀轰緥澶栧崗鍙戞枡鍗�")
+ .issueDate(java.time.LocalDateTime.of(2026, 3, 2, 8, 0))
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "澶栧崗鍙戞枡鍗曞鍏ユā鏉�.xls", "澶栧崗鍙戞枡鍗曞垪琛�", MesWmOutsourceIssueImportExcelVO.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:wm-outsource-issue:import')")
+ public CommonResult<MesWmOutsourceIssueImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmOutsourceIssueImportExcelVO> list = ExcelUtils.read(file, MesWmOutsourceIssueImportExcelVO.class);
+ return success(outsourceIssueService.importOutsourceIssueList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmOutsourceIssueRespVO> buildRespVOList(List<MesWmOutsourceIssueDO> list) {
--
Gitblit v1.9.3