From 381e02b9eccbe953b31d09f2af1c2ce77c816140 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 14:51:05 +0800
Subject: [PATCH] fix(mes): 隔离设备物料并支持销售产品映射
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
index 4a340ec..6df58f0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
@@ -5,6 +5,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.packages.vo.MesWmPackageImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackagePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageSaveReqVO;
@@ -20,13 +23,17 @@
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
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;
import jakarta.validation.Valid;
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.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -78,7 +85,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱瑁呯鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-package:query')")
public CommonResult<MesWmPackageRespVO> getPackage(@RequestParam("id") Long id) {
MesWmPackageDO packageDO = packageService.getPackage(id);
if (packageDO == null) {
@@ -89,7 +95,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱瑁呯鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-package:query')")
public CommonResult<PageResult<MesWmPackageRespVO>> getPackagePage(
@Valid MesWmPackagePageReqVO pageReqVO) {
PageResult<MesWmPackageDO> pageResult = packageService.getPackagePage(pageReqVO);
@@ -153,4 +158,34 @@
});
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瑁呯鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmPackageImportExcelVO> list = Collections.singletonList(
+ MesWmPackageImportExcelVO.builder()
+ .code("PKG20260307001")
+ .packageDate(java.time.LocalDateTime.of(2026, 3, 7, 10, 0, 0))
+ .salesOrderCode("SO20260301")
+ .invoiceCode("INV20260301")
+ .width(new java.math.BigDecimal("40.00")).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "瑁呯鍗曞鍏ユā鏉�.xls", "瑁呯鍗曞垪琛�", MesWmPackageImportExcelVO.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-package:import')")
+ public CommonResult<MesWmPackageImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmPackageImportExcelVO> list = ExcelUtils.read(file, MesWmPackageImportExcelVO.class);
+ return success(packageService.importPackageList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3