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/itemreceipt/MesWmItemReceiptController.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
index 0ccdb11..23db4dd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
@@ -9,6 +9,8 @@
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.itemreceipt.vo.MesWmItemReceiptAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
@@ -22,6 +24,7 @@
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
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;
@@ -29,6 +32,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;
@@ -82,7 +86,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閲囪喘鍏ュ簱鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')")
public CommonResult<MesWmItemReceiptRespVO> getItemReceipt(@RequestParam("id") Long id) {
MesWmItemReceiptDO receipt = itemReceiptService.getItemReceipt(id);
if (receipt == null) {
@@ -93,7 +96,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閲囪喘鍏ュ簱鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')")
public CommonResult<PageResult<MesWmItemReceiptRespVO>> getItemReceiptPage(
@Valid MesWmItemReceiptPageReqVO pageReqVO) {
PageResult<MesWmItemReceiptDO> pageResult = itemReceiptService.getItemReceiptPage(pageReqVO);
@@ -131,7 +133,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱閲囪喘鍏ュ簱鍗曠殑瀹℃牳浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
- @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')")
public CommonResult<Set<Long>> approverIds() {
return success(itemReceiptService.getItemReceiptApproverUserIds());
}
@@ -171,6 +172,35 @@
return success(itemReceiptService.generateItemReceiptFromArrivalNotice(arrivalNoticeId));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱閲囪喘鍏ュ簱鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmItemReceiptImportExcelVO> list = Collections.singletonList(
+ MesWmItemReceiptImportExcelVO.builder()
+ .code("RK001").name("绀轰緥閲囪喘鍏ュ簱鍗�")
+ .purchaseOrderCode("PO001")
+ .receiptDate(java.time.LocalDateTime.now())
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "閲囪喘鍏ュ簱鍗曞鍏ユā鏉�.xls", "閲囪喘鍏ュ簱鍗曞垪琛�", MesWmItemReceiptImportExcelVO.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-item-receipt:import')")
+ public CommonResult<MesWmItemReceiptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmItemReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmItemReceiptImportExcelVO.class);
+ return success(itemReceiptService.importItemReceiptList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmItemReceiptRespVO> buildRespVOList(List<MesWmItemReceiptDO> list) {
--
Gitblit v1.9.3