From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.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/productreceipt/MesWmProductReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java
index d8e5af5..8c46077 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.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.productreceipt.vo.MesWmProductReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO;
@@ -23,6 +25,7 @@
import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptService;
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;
@@ -30,6 +33,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;
@@ -83,7 +87,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱浜у搧鏀惰揣鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
public CommonResult<MesWmProductReceiptRespVO> getProductReceipt(@RequestParam("id") Long id) {
MesWmProductReceiptDO receipt = productReceiptService.getProductReceipt(id);
if (receipt == null) {
@@ -94,7 +97,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱浜у搧鏀惰揣鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
public CommonResult<PageResult<MesWmProductReceiptRespVO>> getProductReceiptPage(
@Valid MesWmProductReceiptPageReqVO pageReqVO) {
PageResult<MesWmProductReceiptDO> pageResult = productReceiptService.getProductReceiptPage(pageReqVO);
@@ -152,11 +154,38 @@
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙浜у搧鏀惰揣鍗曟槑缁嗘暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
public CommonResult<Boolean> checkProductReceiptQuantity(@RequestParam("id") Long id) {
return success(productReceiptService.checkProductReceiptQuantity(id));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱浜у搧鏀惰揣鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmProductReceiptImportExcelVO> list = Collections.singletonList(
+ MesWmProductReceiptImportExcelVO.builder()
+ .code("SH001").name("绀轰緥浜у搧鏀惰揣鍗�")
+ .receiptDate(java.time.LocalDateTime.now())
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "浜у搧鏀惰揣鍗曞鍏ユā鏉�.xls", "浜у搧鏀惰揣鍗曞垪琛�", MesWmProductReceiptImportExcelVO.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-product-receipt:import')")
+ public CommonResult<MesWmProductReceiptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmProductReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmProductReceiptImportExcelVO.class);
+ return success(productReceiptService.importProductReceiptList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmProductReceiptRespVO> buildRespVOList(List<MesWmProductReceiptDO> list) {
--
Gitblit v1.9.3