From 006020bc9a87dc40c2e73bc50f244b348b831de1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:41:56 +0800
Subject: [PATCH] 恢复 ERP 采购入库/退货后端，补齐采购统计接口
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 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 10cef64..b6bc848 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 鏇存柊璁㈠崟椤�
@@ -349,9 +357,12 @@
private void calculateTotalPrice(ErpPurchaseOrderDO purchaseOrder, List<ErpPurchaseOrderItemDO> purchaseOrderItems) {
purchaseOrder.setTotalCount(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getCount, BigDecimal::add));
- purchaseOrder.setTotalProductPrice(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseOrder.setTotalTaxPrice(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseOrder.setTotalPrice(purchaseOrder.getTotalProductPrice().add(purchaseOrder.getTotalTaxPrice()));
+ // 鏄庣粏鐨� totalPrice 鏄�屾暟閲� 脳 鍚◣鍗曚环銆嶏紝鍗冲惈绋庢�讳环锛涗笉鍚◣閲戦 = 鍚◣鎬讳环 鈭� 绋庨
+ BigDecimal totalPriceWithTax = getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO);
+ BigDecimal totalTaxPrice = getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO);
+ purchaseOrder.setTotalTaxPrice(totalTaxPrice);
+ purchaseOrder.setTotalPrice(totalPriceWithTax);
+ purchaseOrder.setTotalProductPrice(totalPriceWithTax.subtract(totalTaxPrice));
// 璁＄畻浼樻儬浠锋牸
if (purchaseOrder.getDiscountPercent() == null) {
purchaseOrder.setDiscountPercent(BigDecimal.ZERO);
@@ -399,6 +410,16 @@
}
// 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
+ // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+ if (processInstanceApi.isGlobalAutoApprove()) {
+ purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
+ .setId(id)
+ .setStatus(ErpAuditStatus.APPROVING.getStatus())
+ .setProcessInstanceId(""));
+ updatePurchaseOrderAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(processDefinitionKey)
@@ -495,13 +516,12 @@
private List<ErpPurchaseOrderItemDO> validatePurchaseOrderItems(List<ErpPurchaseOrderSaveReqVO.Item> list) {
// 杞寲涓� ErpPurchaseOrderItemDO 鍒楄〃锛堜骇鍝侀獙璇佸凡绉婚櫎锛�
return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseOrderItemDO.class, item -> {
+ // 浜у搧鍗曚环涓哄惈绋庡崟浠凤細琛屾�讳环 = 鏁伴噺 脳 鍚◣鍗曚环锛岀◣棰濆啀浠庡惈绋庢�讳环閲屽�掔畻
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
if (item.getTotalPrice() == null) {
return;
}
- if (item.getTaxPercent() != null) {
- item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
- }
+ item.setTaxPrice(MoneyUtils.priceCalculateTaxIncluded(item.getTotalPrice(), item.getTaxPercent()));
}));
}
@@ -530,7 +550,8 @@
// 1. 鏇存柊姣忎釜閲囪喘璁㈠崟椤�
orderItems.forEach(item -> {
BigDecimal inCount = inCountMap.getOrDefault(item.getId(), BigDecimal.ZERO);
- if (item.getInCount().equals(inCount)) {
+ // 鍘嗗彶/瀵煎叆鏁版嵁鐨勫叆搴撴暟閲忓彲鑳戒负绌猴紝鎸� 0 澶勭悊锛岄伩鍏� NPE
+ if (ObjectUtil.defaultIfNull(item.getInCount(), BigDecimal.ZERO).compareTo(inCount) == 0) {
return;
}
if (inCount.compareTo(item.getCount()) > 0) {
@@ -550,12 +571,14 @@
// 1. 鏇存柊姣忎釜閲囪喘璁㈠崟椤�
orderItems.forEach(item -> {
BigDecimal returnCount = returnCountMap.getOrDefault(item.getId(), BigDecimal.ZERO);
- if (item.getReturnCount().equals(returnCount)) {
+ // 鍘嗗彶/瀵煎叆鏁版嵁鐨勯��璐ф暟閲忋�佸叆搴撴暟閲忓彲鑳戒负绌猴紝鎸� 0 澶勭悊锛岄伩鍏� NPE
+ if (ObjectUtil.defaultIfNull(item.getReturnCount(), BigDecimal.ZERO).compareTo(returnCount) == 0) {
return;
}
- if (returnCount.compareTo(item.getInCount()) > 0) {
+ BigDecimal inCount = ObjectUtil.defaultIfNull(item.getInCount(), BigDecimal.ZERO);
+ if (returnCount.compareTo(inCount) > 0) {
throw exception(PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED,
- "浜у搧ID:" + item.getProductId(), item.getInCount());
+ "浜у搧ID:" + item.getProductId(), inCount);
}
purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setReturnCount(returnCount));
});
@@ -589,6 +612,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