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 | 68 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 15 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 8851644..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
@@ -8,6 +8,10 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
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;
@@ -36,18 +40,20 @@
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;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "绠＄悊鍚庡彴 - ERP 閲囪喘鐢宠")
@RestController
-@RequestMapping("/erp/purchase-request")
+@RequestMapping({"/purchase/request", "/erp/purchase-request"})
@Validated
public class ErpPurchaseRequestController {
@@ -94,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) {
@@ -116,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));
@@ -133,21 +137,55 @@
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.writeTemplate(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 = "鎻愪氦閲囪喘鐢宠瀹℃壒")
+ @Operation(summary = "鎻愪氦閲囪喘鐢宠瀹℃壒锛堟湭鎻愪氦/瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級锛屽鎵逛汉鐢卞鎵归厤缃粺涓�鎸囧畾")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('erp:purchase-request:submit')")
- public CommonResult<Boolean> submitPurchaseRequest(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- Long userId = getLoginUserId();
- purchaseRequestService.submitPurchaseRequest(id, processDefinitionKey, userId);
+ public CommonResult<Boolean> submitPurchaseRequest(@RequestParam("id") Long id) {
+ purchaseRequestService.submitPurchaseRequest(id);
return success(true);
}
- @GetMapping("/approve-process-list")
- @Operation(summary = "鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
- public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
- return success(purchaseRequestService.getPurchaseRequestApproveProcessDefinitionList());
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳閲囪喘鐢宠锛堝鎵逛腑 鈫� 瀹℃牳閫氳繃/瀹℃牳涓嶉�氳繃锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:audit')")
+ public CommonResult<Boolean> auditPurchaseRequest(@Valid @RequestBody ErpPurchaseRequestAuditReqVO auditReqVO) {
+ purchaseRequestService.auditPurchaseRequest(auditReqVO.getId(), auditReqVO.getPass(),
+ auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱閲囪喘鐢宠鐨勫鎵逛汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(purchaseRequestService.getPurchaseRequestApproverUserIds());
}
@PostMapping("/generate-order")
@@ -191,4 +229,4 @@
});
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3