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/equipmentreceipt/MesWmEquipmentReceiptController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
index a8addf4..bc45e7e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
@@ -3,18 +3,25 @@
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.equipmentreceipt.vo.*;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.equipmentreceipt.MesWmEquipmentReceiptDO;
import cn.iocoder.yudao.module.mes.service.wm.equipmentreceipt.MesWmEquipmentReceiptService;
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 java.util.Set;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -54,14 +61,12 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璁惧鍏ュ簱鍗�")
- @PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:query')")
public CommonResult<MesWmEquipmentReceiptRespVO> get(@RequestParam("id") Long id) {
return success(BeanUtils.toBean(equipmentReceiptService.getEquipmentReceipt(id), MesWmEquipmentReceiptRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱璁惧鍏ュ簱鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:query')")
public CommonResult<PageResult<MesWmEquipmentReceiptRespVO>> page(@Valid MesWmEquipmentReceiptPageReqVO reqVO) {
return success(BeanUtils.toBean(equipmentReceiptService.getEquipmentReceiptPage(reqVO), MesWmEquipmentReceiptRespVO.class));
}
@@ -84,7 +89,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱璁惧鍏ュ簱鍗曠殑瀹℃牳浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
- @PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:query')")
public CommonResult<Set<Long>> approverIds() {
return success(equipmentReceiptService.getEquipmentReceiptApproverUserIds());
}
@@ -105,4 +109,32 @@
return success(true);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱璁惧鍏ュ簱鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmEquipmentReceiptImportExcelVO> list = Collections.singletonList(
+ MesWmEquipmentReceiptImportExcelVO.builder()
+ .code("ER001").name("绀轰緥璁惧鍏ュ簱鍗�")
+ .receiptDate(java.time.LocalDateTime.now())
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "璁惧鍏ュ簱鍗曞鍏ユā鏉�.xls", "璁惧鍏ュ簱鍗曞垪琛�", MesWmEquipmentReceiptImportExcelVO.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:equipment-receipt:import')")
+ public CommonResult<MesWmEquipmentReceiptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmEquipmentReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmEquipmentReceiptImportExcelVO.class);
+ return success(equipmentReceiptService.importEquipmentReceiptList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3