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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 15ca0e7..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
@@ -40,6 +40,7 @@
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;
@@ -142,9 +143,12 @@
@Operation(summary = "鑾峰緱瀵煎叆閲囪喘鐢宠妯℃澘")
public void importTemplate(HttpServletResponse response) throws IOException {
// 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 娉ㄦ剰锛歳equestTime 鏄鍏ユ椂鐨勫繀濉牎楠岄」锛屾ā鏉块噷蹇呴』缁欏嚭绀轰緥鍊硷紝
+ // 鍚﹀垯鐢ㄦ埛鐓х潃妯℃澘濉畬瀵煎叆蹇呯劧鎶ャ�岀敵璇锋椂闂翠笉鑳戒负绌恒�嶃��
List<ErpPurchaseRequestImportExcelVO> list = Arrays.asList(
- ErpPurchaseRequestImportExcelVO.builder().no("CGSQ-绀轰緥-001").requestTime(null)
- .requestReason("").supplierName("").discountPercent(null).depositPrice(null)
+ 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()
--
Gitblit v1.9.3