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/barcode/MesWmBarcodeConfigController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeConfigController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeConfigController.java
index 4a12b4e..c957a20 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeConfigController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeConfigController.java
@@ -3,6 +3,9 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.barcode.vo.config.MesWmBarcodeConfigImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.barcode.vo.config.MesWmBarcodeConfigImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.barcode.vo.config.MesWmBarcodeConfigPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.barcode.vo.config.MesWmBarcodeConfigRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.barcode.vo.config.MesWmBarcodeConfigSaveReqVO;
@@ -10,12 +13,19 @@
import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeConfigService;
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.Collections;
+import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -55,7 +65,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鏉＄爜閰嶇疆")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-barcode-config:query')")
public CommonResult<MesWmBarcodeConfigRespVO> getBarcodeConfig(@RequestParam("id") Long id) {
MesWmBarcodeConfigDO config = barcodeConfigService.getBarcodeConfig(id);
return success(BeanUtils.toBean(config, MesWmBarcodeConfigRespVO.class));
@@ -63,11 +72,38 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鏉＄爜閰嶇疆鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-barcode-config:query')")
public CommonResult<PageResult<MesWmBarcodeConfigRespVO>> getBarcodeConfigPage(
@Valid MesWmBarcodeConfigPageReqVO pageReqVO) {
PageResult<MesWmBarcodeConfigDO> pageResult = barcodeConfigService.getBarcodeConfigPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesWmBarcodeConfigRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鏉＄爜閰嶇疆瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmBarcodeConfigImportExcelVO> list = Collections.singletonList(
+ MesWmBarcodeConfigImportExcelVO.builder()
+ .bizType(102).format(1).contentFormat("WH-{BUSINESSCODE}")
+ .contentExample("WH-WH001").autoGenerateFlag(true)
+ .defaultTemplate("").status(0).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鏉＄爜閰嶇疆瀵煎叆妯℃澘.xls", "鏉＄爜閰嶇疆鍒楄〃", MesWmBarcodeConfigImportExcelVO.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-barcode-config:import')")
+ public CommonResult<MesWmBarcodeConfigImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmBarcodeConfigImportExcelVO> list = ExcelUtils.read(file, MesWmBarcodeConfigImportExcelVO.class);
+ return success(barcodeConfigService.importBarcodeConfigList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3