From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java
index d457001..36737f4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java
@@ -6,6 +6,8 @@
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.mes.controller.admin.wm.transfer.vo.MesWmTransferImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.MesWmTransferImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.MesWmTransferPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.MesWmTransferRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.MesWmTransferSaveReqVO;
@@ -13,6 +15,7 @@
import cn.iocoder.yudao.module.mes.service.wm.transfer.MesWmTransferService;
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 +23,11 @@
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;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -62,7 +68,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱杞Щ鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-transfer:query')")
public CommonResult<MesWmTransferRespVO> getTransfer(@RequestParam("id") Long id) {
MesWmTransferDO transfer = transferService.getTransfer(id);
return success(BeanUtils.toBean(transfer, MesWmTransferRespVO.class));
@@ -70,7 +75,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱杞Щ鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-transfer:query')")
public CommonResult<PageResult<MesWmTransferRespVO>> getTransferPage(
@Valid MesWmTransferPageReqVO pageReqVO) {
PageResult<MesWmTransferDO> pageResult = transferService.getTransferPage(pageReqVO);
@@ -134,4 +138,33 @@
return success(true);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱杞Щ鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmTransferImportExcelVO> list = Collections.singletonList(
+ MesWmTransferImportExcelVO.builder()
+ .code("TR2026020001").name("绀轰緥杞Щ鍗�")
+ .type(1)
+ .transferDate(java.time.LocalDateTime.of(2026, 3, 1, 10, 0, 0))
+ .recipientName("寮犱笁").remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "杞Щ鍗曞鍏ユā鏉�.xls", "杞Щ鍗曞垪琛�", MesWmTransferImportExcelVO.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-transfer:import')")
+ public CommonResult<MesWmTransferImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmTransferImportExcelVO> list = ExcelUtils.read(file, MesWmTransferImportExcelVO.class);
+ return success(transferService.importTransferList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3