From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..e5efcc1 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;
@@ -99,7 +100,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閲囪喘鐢宠")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<ErpPurchaseRequestRespVO> getPurchaseRequest(@RequestParam("id") Long id) {
ErpPurchaseRequestDO purchaseRequest = purchaseRequestService.getPurchaseRequest(id);
if (purchaseRequest == null) {
@@ -121,7 +121,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閲囪喘鐢宠鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<PageResult<ErpPurchaseRequestRespVO>> getPurchaseRequestPage(@Valid ErpPurchaseRequestPageReqVO pageReqVO) {
PageResult<ErpPurchaseRequestDO> pageResult = purchaseRequestService.getPurchaseRequestPage(pageReqVO);
return success(buildPurchaseRequestVOPageResult(pageResult));
@@ -142,15 +141,18 @@
@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()
);
// 杈撳嚭
- ExcelUtils.write(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠鍒楄〃", ErpPurchaseRequestImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠鍒楄〃", ErpPurchaseRequestImportExcelVO.class, list);
}
@PostMapping("/import")
@@ -182,7 +184,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱閲囪喘鐢宠鐨勫鎵逛汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<Set<Long>> getApproverUserIds() {
return success(purchaseRequestService.getPurchaseRequestApproverUserIds());
}
@@ -228,4 +229,4 @@
});
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3