From cbadfd8e691ab335965202a984db16e55ac8e42c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 17:51:06 +0800
Subject: [PATCH] 诚发五金：按技术方案重构业务功能并补齐库结构
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index b756112..830f7ce 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -81,6 +81,8 @@
private ErpPurchaseOrderMapper purchaseOrderMapper;
@Resource
private ErpPurchaseOrderItemMapper purchaseOrderItemMapper;
+ @Resource
+ private ErpSupplierContractService supplierContractService;
@Resource
private ErpNoRedisDAO noRedisDAO;
@@ -125,6 +127,8 @@
if (createReqVO.getAccountId() != null) {
accountService.validateAccount(createReqVO.getAccountId());
}
+ // 1.3.1 鏍￠獙骞惰В鏋愬叧鑱斿悎鍚岋紙璁㈠崟蹇呴』涓庡悎鍚屽睘浜庡悓涓�渚涘簲鍟嗭級
+ String contractNo = resolveContractNo(createReqVO.getContractId(), createReqVO.getSupplierId());
// 1.4 鐢熸垚璁㈠崟鍙凤紝骞舵牎楠屽敮涓�鎬�
String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
if (purchaseOrderMapper.selectByNo(no) != null) {
@@ -134,7 +138,8 @@
// 2.1 鎻掑叆璁㈠崟锛堥噰璐鍗曞垱寤哄悗涓烘湭瀹℃牳鐘舵�侊紝闇�瑕佹彁浜ゅ鎵癸級
ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
.setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
- .setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus()));
+ .setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus())
+ .setContractNo(contractNo));
calculateTotalPrice(purchaseOrder, purchaseOrderItems);
purchaseOrderMapper.insert(purchaseOrder);
// 2.2 鎻掑叆璁㈠崟椤�
@@ -167,9 +172,12 @@
}
// 1.4 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
List<ErpPurchaseOrderItemDO> purchaseOrderItems = validatePurchaseOrderItems(updateReqVO.getItems());
+ // 1.5 鏍￠獙骞惰В鏋愬叧鑱斿悎鍚�
+ String contractNo = resolveContractNo(updateReqVO.getContractId(), updateReqVO.getSupplierId());
// 2.1 鏇存柊璁㈠崟
ErpPurchaseOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseOrderDO.class);
+ updateObj.setContractNo(contractNo);
calculateTotalPrice(updateObj, purchaseOrderItems);
purchaseOrderMapper.updateById(updateObj);
// 2.2 鏇存柊璁㈠崟椤�
@@ -599,6 +607,21 @@
});
}
+ /**
+ * 鏍￠獙鍏宠仈鍚堝悓锛岃繑鍥炲啑浣欑殑鍚堝悓缂栫爜锛涙湭鍏宠仈鍚堝悓鏃惰繑鍥� null
+ */
+ private String resolveContractNo(Long contractId, Long supplierId) {
+ if (contractId == null) {
+ return null;
+ }
+ cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierContractDO contract =
+ supplierContractService.validateContractExists(contractId);
+ if (!Objects.equals(contract.getSupplierId(), supplierId)) {
+ throw exception(SUPPLIER_CONTRACT_SUPPLIER_MISMATCH);
+ }
+ return contract.getCode();
+ }
+
private ErpPurchaseOrderDO validatePurchaseOrderExists(Long id) {
ErpPurchaseOrderDO purchaseOrder = purchaseOrderMapper.selectById(id);
if (purchaseOrder == null) {
--
Gitblit v1.9.3