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/ErpPurchaseReturnServiceImpl.java | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 327 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
new file mode 100644
index 0000000..da68e9f
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
@@ -0,0 +1,327 @@
+package cn.iocoder.yudao.module.erp.service.purchase;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnItemDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseReturnItemMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseReturnMapper;
+import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mes.api.wms.dto.WmsPurchaseInboundReqDTO;
+import cn.iocoder.yudao.module.mes.api.wms.stock.WmsStockApi;
+import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+
+// TODO 鑺嬭壙锛氳褰曟搷浣滄棩蹇�
+
+/**
+ * ERP 閲囪喘閫�璐� Service 瀹炵幇绫�
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@Service
+@Validated
+@Slf4j
+public class ErpPurchaseReturnServiceImpl implements ErpPurchaseReturnService {
+
+ @Resource
+ private ErpPurchaseReturnMapper purchaseReturnMapper;
+ @Resource
+ private ErpPurchaseReturnItemMapper purchaseReturnItemMapper;
+
+ @Resource
+ private ErpNoRedisDAO noRedisDAO;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ @Lazy // 寤惰繜鍔犺浇锛岄伩鍏嶅惊鐜緷璧�
+ private ErpPurchaseOrderService purchaseOrderService;
+ @Resource
+ private ErpAccountService accountService;
+ @Resource
+ private WmsStockApi wmsStockApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createPurchaseReturn(ErpPurchaseReturnSaveReqVO createReqVO) {
+ // 1.1 鏍￠獙閲囪喘璁㈠崟宸插鏍�
+ ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.validatePurchaseOrder(createReqVO.getOrderId());
+ // 1.2 鏍￠獙閫�璐ч」鐨勬湁鏁堟��
+ List<ErpPurchaseReturnItemDO> purchaseReturnItems = validatePurchaseReturnItems(createReqVO.getItems());
+ // 1.3 鏍￠獙缁撶畻璐︽埛
+ accountService.validateAccount(createReqVO.getAccountId());
+ // 1.4 鐢熸垚閫�璐у崟鍙凤紝骞舵牎楠屽敮涓�鎬�
+ String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_RETURN_NO_PREFIX);
+ if (purchaseReturnMapper.selectByNo(no) != null) {
+ throw exception(PURCHASE_RETURN_NO_EXISTS);
+ }
+
+ // 2.1 鎻掑叆閫�璐�
+ ErpPurchaseReturnDO purchaseReturn = BeanUtils.toBean(createReqVO, ErpPurchaseReturnDO.class, in -> in
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()))
+ .setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId());
+ calculateTotalPrice(purchaseReturn, purchaseReturnItems);
+ purchaseReturnMapper.insert(purchaseReturn);
+ // 2.2 鎻掑叆閫�璐ч」
+ purchaseReturnItems.forEach(o -> o.setReturnId(purchaseReturn.getId()));
+ purchaseReturnItemMapper.insertBatch(purchaseReturnItems);
+
+ // 3. 鏇存柊閲囪喘璁㈠崟鐨勯��璐ф暟閲�
+ updatePurchaseOrderReturnCount(createReqVO.getOrderId());
+ return purchaseReturn.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseReturn(ErpPurchaseReturnSaveReqVO updateReqVO) {
+ // 1.1 鏍￠獙瀛樺湪
+ ErpPurchaseReturnDO purchaseReturn = validatePurchaseReturnExists(updateReqVO.getId());
+ if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseReturn.getStatus())) {
+ throw exception(PURCHASE_RETURN_UPDATE_FAIL_APPROVE, purchaseReturn.getNo());
+ }
+ // 1.2 鏍￠獙閲囪喘璁㈠崟宸插鏍�
+ ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.validatePurchaseOrder(updateReqVO.getOrderId());
+ // 1.3 鏍￠獙缁撶畻璐︽埛
+ accountService.validateAccount(updateReqVO.getAccountId());
+ // 1.4 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
+ List<ErpPurchaseReturnItemDO> purchaseReturnItems = validatePurchaseReturnItems(updateReqVO.getItems());
+
+ // 2.1 鏇存柊閫�璐�
+ ErpPurchaseReturnDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseReturnDO.class)
+ .setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId());
+ calculateTotalPrice(updateObj, purchaseReturnItems);
+ purchaseReturnMapper.updateById(updateObj);
+ // 2.2 鏇存柊閫�璐ч」
+ updatePurchaseReturnItemList(updateReqVO.getId(), purchaseReturnItems);
+
+ // 3.1 鏇存柊閲囪喘璁㈠崟鐨勫嚭搴撴暟閲�
+ updatePurchaseOrderReturnCount(updateObj.getOrderId());
+ // 3.2 娉ㄦ剰锛氬鏋滈噰璐鍗曠紪鍙峰彉鏇翠簡锛岄渶瑕佹洿鏂扳�滆�佲�濋噰璐鍗曠殑鍑哄簱鏁伴噺
+ if (ObjectUtil.notEqual(purchaseReturn.getOrderId(), updateObj.getOrderId())) {
+ updatePurchaseOrderReturnCount(purchaseReturn.getOrderId());
+ }
+ }
+
+ private void calculateTotalPrice(ErpPurchaseReturnDO purchaseReturn, List<ErpPurchaseReturnItemDO> purchaseReturnItems) {
+ purchaseReturn.setTotalCount(getSumValue(purchaseReturnItems, ErpPurchaseReturnItemDO::getCount, BigDecimal::add));
+ purchaseReturn.setTotalProductPrice(getSumValue(purchaseReturnItems, ErpPurchaseReturnItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseReturn.setTotalTaxPrice(getSumValue(purchaseReturnItems, ErpPurchaseReturnItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseReturn.setTotalPrice(purchaseReturn.getTotalProductPrice().add(purchaseReturn.getTotalTaxPrice()));
+ // 璁＄畻浼樻儬浠锋牸
+ if (purchaseReturn.getDiscountPercent() == null) {
+ purchaseReturn.setDiscountPercent(BigDecimal.ZERO);
+ }
+ purchaseReturn.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseReturn.getTotalPrice(), purchaseReturn.getDiscountPercent()));
+ purchaseReturn.setTotalPrice(purchaseReturn.getTotalPrice().subtract(purchaseReturn.getDiscountPrice()).add(purchaseReturn.getOtherPrice()));
+ }
+
+ private void updatePurchaseOrderReturnCount(Long orderId) {
+ // 1.1 鏌ヨ閲囪喘璁㈠崟瀵瑰簲鐨勯噰璐嚭搴撳崟鍒楄〃
+ List<ErpPurchaseReturnDO> purchaseReturns = purchaseReturnMapper.selectListByOrderId(orderId);
+ // 1.2 鏌ヨ瀵瑰簲鐨勯噰璐鍗曢」鐨勯��璐ф暟閲�
+ Map<Long, BigDecimal> returnCountMap = purchaseReturnItemMapper.selectOrderItemCountSumMapByReturnIds(
+ convertList(purchaseReturns, ErpPurchaseReturnDO::getId));
+ // 2. 鏇存柊閲囪喘璁㈠崟鐨勫嚭搴撴暟閲�
+ purchaseOrderService.updatePurchaseOrderReturnCount(orderId, returnCountMap);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseReturnStatus(Long id, Integer status) {
+ boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
+ // 1.1 鏍￠獙瀛樺湪
+ ErpPurchaseReturnDO purchaseReturn = validatePurchaseReturnExists(id);
+ // 1.2 鏍￠獙鐘舵��
+ if (purchaseReturn.getStatus().equals(status)) {
+ throw exception(approve ? PURCHASE_RETURN_APPROVE_FAIL : PURCHASE_RETURN_PROCESS_FAIL);
+ }
+ // 1.3 鏍￠獙宸查��娆�
+ if (!approve && purchaseReturn.getRefundPrice().compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(PURCHASE_RETURN_PROCESS_FAIL_EXISTS_REFUND);
+ }
+
+ // 2. 鏇存柊鐘舵��
+ int updateCount = purchaseReturnMapper.updateByIdAndStatus(id, purchaseReturn.getStatus(),
+ new ErpPurchaseReturnDO().setStatus(status));
+ if (updateCount == 0) {
+ throw exception(approve ? PURCHASE_RETURN_APPROVE_FAIL : PURCHASE_RETURN_PROCESS_FAIL);
+ }
+
+ // 3. 瀹℃牳閫氳繃鏃讹紝鍚屾 MES 浠撳偍瀛樿揣锛堥噰璐��璐у嚭搴擄級
+ if (approve) {
+ syncToWmsPurchaseReturnOutbound(purchaseReturn);
+ }
+ }
+
+ /**
+ * 鍚屾閲囪喘閫�璐у埌 WMS锛圡ES 浠撳偍锛夊簱瀛�
+ */
+ private void syncToWmsPurchaseReturnOutbound(ErpPurchaseReturnDO purchaseReturn) {
+ List<ErpPurchaseReturnItemDO> purchaseReturnItems = purchaseReturnItemMapper.selectListByReturnId(purchaseReturn.getId());
+ if (CollUtil.isEmpty(purchaseReturnItems)) {
+ return;
+ }
+ WmsPurchaseInboundReqDTO reqDTO = new WmsPurchaseInboundReqDTO()
+ .setBizId(purchaseReturn.getId())
+ .setBizCode(purchaseReturn.getNo())
+ .setVendorId(purchaseReturn.getSupplierId())
+ .setReceiptTime(purchaseReturn.getReturnTime())
+ .setItems(convertList(purchaseReturnItems, item -> new WmsPurchaseInboundReqDTO.Item()
+ .setItemId(item.getProductId())
+ .setWarehouseId(item.getWarehouseId())
+ .setQuantity(item.getCount())
+ .setBizLineId(item.getId())));
+ try {
+ wmsStockApi.purchaseReturnOutbound(reqDTO);
+ } catch (Exception e) {
+ log.error("[syncToWmsPurchaseReturnOutbound] 鍚屾澶辫触锛宲urchaseReturnId={}", purchaseReturn.getId(), e);
+ }
+ }
+
+ @Override
+ public void updatePurchaseReturnRefundPrice(Long id, BigDecimal refundPrice) {
+ ErpPurchaseReturnDO purchaseReturn = purchaseReturnMapper.selectById(id);
+ if (purchaseReturn.getRefundPrice().equals(refundPrice)) {
+ return;
+ }
+ if (refundPrice.compareTo(purchaseReturn.getTotalPrice()) > 0) {
+ throw exception(PURCHASE_RETURN_FAIL_REFUND_PRICE_EXCEED, refundPrice, purchaseReturn.getTotalPrice());
+ }
+ purchaseReturnMapper.updateById(new ErpPurchaseReturnDO().setId(id).setRefundPrice(refundPrice));
+ }
+
+ private List<ErpPurchaseReturnItemDO> validatePurchaseReturnItems(List<ErpPurchaseReturnSaveReqVO.Item> list) {
+ // 1. 鏍￠獙鐗╂枡瀛樺湪锛堢墿鏂欎富鏁版嵁宸茶縼绉诲埌 MDM锛�
+ Set<Long> productIds = convertSet(list, ErpPurchaseReturnSaveReqVO.Item::getProductId);
+ Map<Long, MdmItemRespDTO> itemMap = productIds.isEmpty() ? Collections.emptyMap() : mdmItemApi.getItemMap(productIds);
+ if (itemMap.size() != productIds.size()) {
+ throw exception(PRODUCT_NOT_EXISTS);
+ }
+ // 2. 杞寲涓� ErpPurchaseReturnItemDO 鍒楄〃
+ return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseReturnItemDO.class, item -> {
+ item.setProductUnitId(itemMap.get(item.getProductId()).getUnitMeasureId());
+ 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()));
+ }
+ }));
+ }
+
+ private void updatePurchaseReturnItemList(Long id, List<ErpPurchaseReturnItemDO> newList) {
+ // 绗竴姝ワ紝瀵规瘮鏂拌�佹暟鎹紝鑾峰緱娣诲姞銆佷慨鏀广�佸垹闄ょ殑鍒楄〃
+ List<ErpPurchaseReturnItemDO> oldList = purchaseReturnItemMapper.selectListByReturnId(id);
+ List<List<ErpPurchaseReturnItemDO>> diffList = diffList(oldList, newList, // id 涓嶅悓锛屽氨璁や负鏄笉鍚岀殑璁板綍
+ (oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
+
+ // 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
+ if (CollUtil.isNotEmpty(diffList.get(0))) {
+ diffList.get(0).forEach(o -> o.setReturnId(id));
+ purchaseReturnItemMapper.insertBatch(diffList.get(0));
+ }
+ if (CollUtil.isNotEmpty(diffList.get(1))) {
+ purchaseReturnItemMapper.updateBatch(diffList.get(1));
+ }
+ if (CollUtil.isNotEmpty(diffList.get(2))) {
+ purchaseReturnItemMapper.deleteByIds(convertList(diffList.get(2), ErpPurchaseReturnItemDO::getId));
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePurchaseReturn(List<Long> ids) {
+ // 1. 鏍￠獙涓嶅浜庡凡瀹℃壒
+ List<ErpPurchaseReturnDO> purchaseReturns = purchaseReturnMapper.selectByIds(ids);
+ if (CollUtil.isEmpty(purchaseReturns)) {
+ return;
+ }
+ purchaseReturns.forEach(purchaseReturn -> {
+ if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseReturn.getStatus())) {
+ throw exception(PURCHASE_RETURN_DELETE_FAIL_APPROVE, purchaseReturn.getNo());
+ }
+ });
+
+ // 2. 閬嶅巻鍒犻櫎锛屽苟璁板綍鎿嶄綔鏃ュ織
+ purchaseReturns.forEach(purchaseReturn -> {
+ // 2.1 鍒犻櫎璁㈠崟
+ purchaseReturnMapper.deleteById(purchaseReturn.getId());
+ // 2.2 鍒犻櫎璁㈠崟椤�
+ purchaseReturnItemMapper.deleteByReturnId(purchaseReturn.getId());
+
+ // 2.3 鏇存柊閲囪喘璁㈠崟鐨勫嚭搴撴暟閲�
+ updatePurchaseOrderReturnCount(purchaseReturn.getOrderId());
+ });
+
+ }
+
+ private ErpPurchaseReturnDO validatePurchaseReturnExists(Long id) {
+ ErpPurchaseReturnDO purchaseReturn = purchaseReturnMapper.selectById(id);
+ if (purchaseReturn == null) {
+ throw exception(PURCHASE_RETURN_NOT_EXISTS);
+ }
+ return purchaseReturn;
+ }
+
+ @Override
+ public ErpPurchaseReturnDO getPurchaseReturn(Long id) {
+ return purchaseReturnMapper.selectById(id);
+ }
+
+ @Override
+ public ErpPurchaseReturnDO validatePurchaseReturn(Long id) {
+ ErpPurchaseReturnDO purchaseReturn = getPurchaseReturn(id);
+ if (ObjectUtil.notEqual(purchaseReturn.getStatus(), ErpAuditStatus.APPROVE.getStatus())) {
+ throw exception(PURCHASE_RETURN_NOT_APPROVE);
+ }
+ return purchaseReturn;
+ }
+
+ @Override
+ public PageResult<ErpPurchaseReturnDO> getPurchaseReturnPage(ErpPurchaseReturnPageReqVO pageReqVO) {
+ return purchaseReturnMapper.selectPage(pageReqVO);
+ }
+
+ // ==================== 閲囪喘閫�璐ч」 ====================
+
+ @Override
+ public List<ErpPurchaseReturnItemDO> getPurchaseReturnItemListByReturnId(Long returnId) {
+ return purchaseReturnItemMapper.selectListByReturnId(returnId);
+ }
+
+ @Override
+ public List<ErpPurchaseReturnItemDO> getPurchaseReturnItemListByReturnIds(Collection<Long> returnIds) {
+ if (CollUtil.isEmpty(returnIds)) {
+ return Collections.emptyList();
+ }
+ return purchaseReturnItemMapper.selectListByReturnIds(returnIds);
+ }
+
+}
--
Gitblit v1.9.3