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/pd/product/MesPdProductController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/product/MesPdProductController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/product/MesPdProductController.java
index 5e62315..7ca2c99 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/product/MesPdProductController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/product/MesPdProductController.java
@@ -6,12 +6,15 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pd.product.vo.MesPdProductAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.product.vo.MesPdProductImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.product.vo.MesPdProductImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.product.vo.MesPdProductPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.product.vo.MesPdProductRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.product.vo.MesPdProductSaveReqVO;
import cn.iocoder.yudao.module.mes.service.pd.product.MesPdProductService;
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;
@@ -19,8 +22,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;
@@ -61,14 +67,12 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱浜у搧妗ｆ")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pd-product:query')")
public CommonResult<MesPdProductRespVO> getProduct(@RequestParam("id") Long id) {
return success(productService.getProduct(id));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱浜у搧妗ｆ鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pd-product:query')")
public CommonResult<PageResult<MesPdProductRespVO>> getProductPage(@Valid MesPdProductPageReqVO pageReqVO) {
return success(productService.getProductPage(pageReqVO));
}
@@ -84,6 +88,34 @@
ExcelUtils.write(response, "浜у搧妗ｆ.xls", "鏁版嵁", MesPdProductRespVO.class, pageResult.getList());
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱浜у搧妗ｆ瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesPdProductImportExcelVO> list = Collections.singletonList(
+ MesPdProductImportExcelVO.builder()
+ .archiveType(1).name("绀轰緥浜у搧").spec("").unit("")
+ .price(new java.math.BigDecimal("100.00"))
+ .status(1).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "浜у搧妗ｆ瀵煎叆妯℃澘.xls", "浜у搧妗ｆ鍒楄〃", MesPdProductImportExcelVO.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:pd-product:import')")
+ public CommonResult<MesPdProductImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesPdProductImportExcelVO> list = ExcelUtils.read(file, MesPdProductImportExcelVO.class);
+ return success(productService.importProductList(list, updateSupport));
+ }
+
@PutMapping("/submit")
@Operation(summary = "鎻愪氦瀹℃壒锛堟湭鎻愪氦/椹冲洖鈫掑鎵逛腑锛�")
@Parameter(name = "id", description = "缂栧彿", required = true)
--
Gitblit v1.9.3