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 | 73 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 28 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
index f7fa72f..da68e9f 100644
--- 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
@@ -7,7 +7,6 @@
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.product.ErpProductDO;
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;
@@ -15,15 +14,16 @@
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.enums.stock.ErpStockRecordBizTypeEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
-import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
-import cn.iocoder.yudao.module.erp.service.stock.ErpStockRecordService;
-import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
+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;
@@ -31,6 +31,7 @@
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.*;
@@ -45,6 +46,7 @@
*/
@Service
@Validated
+@Slf4j
public class ErpPurchaseReturnServiceImpl implements ErpPurchaseReturnService {
@Resource
@@ -56,14 +58,14 @@
private ErpNoRedisDAO noRedisDAO;
@Resource
- private ErpProductService productService;
+ private MdmItemApi mdmItemApi;
@Resource
@Lazy // 寤惰繜鍔犺浇锛岄伩鍏嶅惊鐜緷璧�
private ErpPurchaseOrderService purchaseOrderService;
@Resource
private ErpAccountService accountService;
@Resource
- private ErpStockRecordService stockRecordService;
+ private WmsStockApi wmsStockApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -171,22 +173,35 @@
throw exception(approve ? PURCHASE_RETURN_APPROVE_FAIL : PURCHASE_RETURN_PROCESS_FAIL);
}
- // 3. 鍙樻洿搴撳瓨
- List<ErpPurchaseReturnItemDO> purchaseReturnItems = purchaseReturnItemMapper.selectListByReturnId(id);
- Integer bizType = approve ? ErpStockRecordBizTypeEnum.PURCHASE_RETURN.getType()
- : ErpStockRecordBizTypeEnum.PURCHASE_RETURN_CANCEL.getType();
- purchaseReturnItems.forEach(purchaseReturnItem -> {
- BigDecimal count = approve ? purchaseReturnItem.getCount().negate() : purchaseReturnItem.getCount();
- ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
- stockRecordBO.setProductId(purchaseReturnItem.getProductId());
- stockRecordBO.setWarehouseId(purchaseReturnItem.getWarehouseId());
- stockRecordBO.setCount(count);
- stockRecordBO.setBizType(bizType);
- stockRecordBO.setBizId(purchaseReturnItem.getReturnId());
- stockRecordBO.setBizItemId(purchaseReturnItem.getId());
- stockRecordBO.setBizNo(purchaseReturn.getNo());
- stockRecordService.createStockRecord(stockRecordBO);
- });
+ // 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
@@ -202,13 +217,15 @@
}
private List<ErpPurchaseReturnItemDO> validatePurchaseReturnItems(List<ErpPurchaseReturnSaveReqVO.Item> list) {
- // 1. 鏍￠獙浜у搧瀛樺湪
- List<ErpProductDO> productList = productService.validProductList(
- convertSet(list, ErpPurchaseReturnSaveReqVO.Item::getProductId));
- Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
+ // 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(productMap.get(item.getProductId()).getUnitId());
+ item.setProductUnitId(itemMap.get(item.getProductId()).getUnitMeasureId());
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
if (item.getTotalPrice() == null) {
return;
--
Gitblit v1.9.3