From 7abf9f290c39dd20f865be53dbecee7fab6de140 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 19:12:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index 01e2453..4571401 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -9,6 +9,9 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestAuditReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
@@ -37,6 +40,8 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -134,6 +139,33 @@
ExcelUtils.write(response, "閲囪喘鐢宠.xls", "鏁版嵁", ErpPurchaseRequestRespVO.class, list);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆閲囪喘鐢宠妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 娉ㄦ剰锛歳equestTime 鏄鍏ユ椂鐨勫繀濉牎楠岄」锛屾ā鏉块噷蹇呴』缁欏嚭绀轰緥鍊硷紝
+ // 鍚﹀垯鐢ㄦ埛鐓х潃妯℃澘濉畬瀵煎叆蹇呯劧鎶ャ�岀敵璇锋椂闂翠笉鑳戒负绌恒�嶃��
+ List<ErpPurchaseRequestImportExcelVO> list = Arrays.asList(
+ ErpPurchaseRequestImportExcelVO.builder().no("CGSQ-绀轰緥-001")
+ .requestTime(LocalDateTime.now().withNano(0))
+ .requestReason("闇�姹傝鏄�").supplierName("").discountPercent(null).depositPrice(null)
+ .remark("").productCode("").productUnitCode("").productPrice(null)
+ .count(null).taxPercent(null).demandTime(null).qcCheckFlag(false)
+ .itemRemark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠鍒楄〃", ErpPurchaseRequestImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閲囪喘鐢宠")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:import')")
+ public CommonResult<ErpPurchaseRequestImportRespVO> importExcel(@Valid ErpPurchaseRequestImportReqVO importReqVO)
+ throws Exception {
+ List<ErpPurchaseRequestImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), ErpPurchaseRequestImportExcelVO.class);
+ return success(purchaseRequestService.importPurchaseRequestList(list, importReqVO));
+ }
+
@PutMapping("/submit")
@Operation(summary = "鎻愪氦閲囪喘鐢宠瀹℃壒锛堟湭鎻愪氦/瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級锛屽鎵逛汉鐢卞鎵归厤缃粺涓�鎸囧畾")
@Parameter(name = "id", description = "缂栧彿", required = true)
--
Gitblit v1.9.3