From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 2768c47..82b0986 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
@@ -567,11 +567,16 @@
if (purchaseRequest.getOrderId() != null) {
throw exception(PURCHASE_REQUEST_ORDER_EXISTS);
}
- // 3. 鏍￠獙渚涘簲鍟�
- supplierService.validateSupplier(supplierId);
+ // 3. 渚涘簲鍟嗕互閲囪喘鐢宠鍗曚负鍑嗭細鐢宠鎻愪氦鏃跺凡缁忛�夎繃渚涘簲鍟嗭紝鐢熸垚璁㈠崟涓嶅啀瑕佹眰閲嶆柊閫夋嫨
+ // 鍏煎鏃ц皟鐢ㄦ柟浠嶆樉寮忎紶 supplierId 鐨勬儏鍐碉紝浼犱簡鍒欎互浼犲叆鍊间负鍑�
+ Long targetSupplierId = supplierId != null ? supplierId : purchaseRequest.getSupplierId();
+ if (targetSupplierId == null) {
+ throw exception(PURCHASE_REQUEST_SUPPLIER_REQUIRED);
+ }
+ supplierService.validateSupplier(targetSupplierId);
// 4. 璁剧疆渚涘簲鍟嗗苟鐢熸垚璁㈠崟
- purchaseRequest.setSupplierId(supplierId);
+ purchaseRequest.setSupplierId(targetSupplierId);
return doGeneratePurchaseOrder(purchaseRequest);
}
@@ -599,7 +604,9 @@
// 3. 鍒涘缓閲囪喘璁㈠崟
ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
purchaseOrder.setNo(orderNo);
- purchaseOrder.setStatus(ErpAuditStatus.APPROVE.getStatus()); // 閲囪喘璁㈠崟鐩存帴涓哄凡瀹℃牳鐘舵��
+ // 鐢熸垚鍚庝负鑽夌锛氶噰璐敵璇蜂笌閲囪喘鍙拌处瀛楁涓嶅畬鍏ㄤ竴鑷达紙浠樻鏃ユ湡銆侀噰璐被鍨嬨�佷粯娆炬柟寮忕瓑锛夛紝
+ // 闇�瑕佷笟鍔″湪閲囪喘鍙拌处閲岃ˉ鍏呭畬鏁村悗鍐嶆彁浜ゅ鎵�
+ purchaseOrder.setStatus(ErpAuditStatus.DRAFT.getStatus());
purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
@@ -628,7 +635,8 @@
orderItem.setTaxPrice(item.getTaxPrice());
orderItem.setRemark(item.getRemark());
orderItem.setInCount(BigDecimal.ZERO);
- orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : false);
+ // 鏄惁璐ㄦ涓庨噰璐敵璇蜂繚鎸佷竴鑷达細鏄庣粏鏈槑纭爣璁版椂榛樿涓恒�屾槸銆嶏紙鍘嗗彶鐢宠鍗曞彲鑳戒负 null锛�
+ orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : true);
return orderItem;
});
purchaseOrderItemMapper.insertBatch(orderItems);
@@ -636,6 +644,7 @@
// 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭�
purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
.setId(id)
+ .setSupplierId(purchaseRequest.getSupplierId())
.setOrderId(purchaseOrder.getId())
.setOrderNo(orderNo));
--
Gitblit v1.9.3