From 05ab6e3f69a5e73624b2573db043f5923e8f7d8b Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 05 十一月 2026 14:17:19 +0800
Subject: [PATCH] fix 修复bug
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 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 08be571..5d93f44 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
@@ -8,9 +8,11 @@
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.itemreceipt.vo.MesWmItemReceiptImportExcelVO;
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;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.vo.MesWmDocImportRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
@@ -21,6 +23,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;
@@ -28,8 +31,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.math.BigDecimal;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -165,6 +171,37 @@
return success(true);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱閲囪喘鍏ュ簱鍗曞鍏ユā鏉�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<MesWmItemReceiptImportExcelVO> list = Arrays.asList(
+ MesWmItemReceiptImportExcelVO.builder()
+ .receiptCode("CGRK2026030001").receiptName("3鏈堢涓�鎵归噰璐叆搴�")
+ .vendorName("绀轰緥渚涘簲鍟�").receiptDate("2026-03-01").purchaseOrderCode("PO2026030001")
+ .itemCode("ITEM_RAW_001").receivedQuantity(new BigDecimal("500"))
+ .productionDate("2026-02-20").expireDate("2027-02-19").lotNumber("PB20260220")
+ .remark("绀轰緥锛氬悓涓�鍏ュ簱鍗曠紪鐮佺殑澶氳浼氬綊骞朵负涓�寮犲崟鎹�").build(),
+ MesWmItemReceiptImportExcelVO.builder()
+ .receiptCode("CGRK2026030001").receiptName("3鏈堢涓�鎵归噰璐叆搴�")
+ .vendorName("绀轰緥渚涘簲鍟�").receiptDate("2026-03-01").purchaseOrderCode("PO2026030001")
+ .itemCode("ITEM_RAW_002").receivedQuantity(new BigDecimal("300"))
+ .remark("绀轰緥锛氱浜岃鏄庣粏").build()
+ );
+ ExcelUtils.writeTemplate(response, "閲囪喘鍏ュ簱鍗曞鍏ユā鏉�.xls", "閲囪喘鍏ュ簱鍗�", MesWmItemReceiptImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閲囪喘鍏ュ簱鍗�")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true)
+ })
+ @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:import')")
+ public CommonResult<MesWmDocImportRespVO> importExcel(@RequestParam("file") MultipartFile file) throws Exception {
+ List<MesWmItemReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmItemReceiptImportExcelVO.class);
+ return success(itemReceiptService.importItemReceiptList(list));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmItemReceiptRespVO> buildRespVOList(List<MesWmItemReceiptDO> list) {
--
Gitblit v1.9.3