From 3ca1cefd9bed863131ee3f684ff127bd7ac877aa Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 05 八月 2026 11:35:16 +0800
Subject: [PATCH] feat(ai): 优化AI知识文档处理功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
index 540aadc..7f2debd 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -129,7 +129,7 @@
@Transactional(rollbackFor = Exception.class)
public void updatePurchaseRequest(ErpPurchaseRequestSaveReqVO updateReqVO) {
// 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExistsAndDraft(updateReqVO.getId());
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestCanModify(updateReqVO.getId());
// 2. 鏍￠獙渚涘簲鍟嗭紙濡傛灉鎸囧畾锛�
if (updateReqVO.getSupplierId() != null) {
supplierService.validateSupplier(updateReqVO.getSupplierId());
@@ -198,8 +198,9 @@
return;
}
purchaseRequests.forEach(purchaseRequest -> {
- // 鍙湁鑽夌鐘舵�佹墠鑳藉垹闄�
- if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())) {
+ Integer status = purchaseRequest.getStatus();
+ if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(status)
+ && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)) {
throw exception(PURCHASE_REQUEST_DELETE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
}
});
@@ -246,7 +247,7 @@
@Transactional(rollbackFor = Exception.class)
public void submitPurchaseRequest(Long id, String processDefinitionKey, Long userId) {
// 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExistsAndDraft(id);
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestCanModify(id);
// 2. 鏍￠獙鏄惁鏈夋槑缁�
List<ErpPurchaseRequestItemDO> items = purchaseRequestItemMapper.selectListByRequestId(id);
@@ -455,9 +456,11 @@
return purchaseRequest;
}
- private ErpPurchaseRequestDO validatePurchaseRequestExistsAndDraft(Long id) {
+ private ErpPurchaseRequestDO validatePurchaseRequestCanModify(Long id) {
ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
- if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())) {
+ Integer status = purchaseRequest.getStatus();
+ if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(status)
+ && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)) {
throw exception(PURCHASE_REQUEST_UPDATE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
}
return purchaseRequest;
--
Gitblit v1.9.3