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/ErpPurchaseInServiceImpl.java | 185 ++++++++++++++++-----------------------------
1 files changed, 67 insertions(+), 118 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
index 8481a93..b1f7bf5 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
@@ -2,14 +2,12 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
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.bpm.api.task.BpmProcessInstanceApi;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInSaveReqVO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
@@ -17,11 +15,11 @@
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInMapper;
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 cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -31,14 +29,18 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
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 瀹炵幇绫�
@@ -50,11 +52,6 @@
@Slf4j
public class ErpPurchaseInServiceImpl implements ErpPurchaseInService {
- /**
- * BPM 閲囪喘鍏ュ簱瀹℃壒娴佺▼鏍囪瘑
- */
- public static final String BPM_PROCESS_DEFINITION_KEY = "erp-purchase-in-audit";
-
@Resource
private ErpPurchaseInMapper purchaseInMapper;
@Resource
@@ -64,20 +61,18 @@
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;
@Resource
private AdminUserApi adminUserApi;
-
- @Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -96,7 +91,7 @@
// 2.1 鎻掑叆鍏ュ簱
ErpPurchaseInDO purchaseIn = BeanUtils.toBean(createReqVO, ErpPurchaseInDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()))
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()))
.setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId());
calculateTotalPrice(purchaseIn, purchaseInItems);
purchaseInMapper.insert(purchaseIn);
@@ -185,22 +180,53 @@
throw exception(approve ? PURCHASE_IN_APPROVE_FAIL : PURCHASE_IN_PROCESS_FAIL);
}
- // 3. 鍙樻洿搴撳瓨
- List<ErpPurchaseInItemDO> purchaseInItems = purchaseInItemMapper.selectListByInId(id);
- Integer bizType = approve ? ErpStockRecordBizTypeEnum.PURCHASE_IN.getType()
- : ErpStockRecordBizTypeEnum.PURCHASE_IN_CANCEL.getType();
- purchaseInItems.forEach(purchaseInItem -> {
- BigDecimal count = approve ? purchaseInItem.getCount() : purchaseInItem.getCount().negate();
- ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
- stockRecordBO.setProductId(purchaseInItem.getProductId());
- stockRecordBO.setWarehouseId(purchaseInItem.getWarehouseId());
- stockRecordBO.setCount(count);
- stockRecordBO.setBizType(bizType);
- stockRecordBO.setBizId(purchaseInItem.getInId());
- stockRecordBO.setBizItemId(purchaseInItem.getId());
- stockRecordBO.setBizNo(purchaseIn.getNo());
- stockRecordService.createStockRecord(stockRecordBO);
- });
+ // 3. 鍚屾 WMS 搴撳瓨锛圡ES 搴撳瓨锛�
+ if (approve) {
+ List<ErpPurchaseInItemDO> purchaseInItems = purchaseInItemMapper.selectListByInId(id);
+ syncToWmsPurchaseInbound(purchaseIn, purchaseInItems);
+ }
+ }
+
+ /**
+ * 鍚屾閲囪喘鍏ュ簱鍒� WMS 搴撳瓨
+ */
+ private void syncToWmsPurchaseInbound(ErpPurchaseInDO purchaseIn, List<ErpPurchaseInItemDO> purchaseInItems) {
+ if (CollUtil.isEmpty(purchaseInItems)) {
+ return;
+ }
+
+ log.info("[syncToWmsPurchaseInbound] 寮�濮嬪悓姝ラ噰璐叆搴撳埌WMS锛宲urchaseInId={}", purchaseIn.getId());
+
+ // 鏋勫缓鍏ュ簱璇锋眰
+ WmsPurchaseInboundReqDTO reqDTO = new WmsPurchaseInboundReqDTO()
+ .setBizId(purchaseIn.getId())
+ .setBizCode(purchaseIn.getNo())
+ .setReceiptTime(LocalDateTime.now());
+
+ // 杞崲鏄庣粏椤癸細ERP 浜у搧缂栧彿鍗� MDM 鐗╂枡缂栧彿锛屼粨搴撶紪鍙峰嵆 MES 浠撳簱缂栧彿
+ List<WmsPurchaseInboundReqDTO.Item> items = convertList(purchaseInItems, item -> new WmsPurchaseInboundReqDTO.Item()
+ .setItemId(item.getProductId())
+ .setWarehouseId(item.getWarehouseId())
+ .setQuantity(item.getCount())
+ .setBizLineId(item.getId()));
+
+ // 杩囨护鎺夋槧灏勫け璐ョ殑椤�
+ items = items.stream().filter(java.util.Objects::nonNull).toList();
+ if (CollUtil.isEmpty(items)) {
+ log.warn("[syncToWmsPurchaseInbound] 鏃犳湁鏁堢殑鍏ュ簱鏄庣粏锛岃烦杩嘩MS鍚屾");
+ return;
+ }
+
+ reqDTO.setItems(items);
+
+ try {
+ Long transactionId = wmsStockApi.purchaseInbound(reqDTO);
+ log.info("[syncToWmsPurchaseInbound] 鍚屾鎴愬姛锛宼ransactionId={}", transactionId);
+ } catch (Exception e) {
+ log.error("[syncToWmsPurchaseInbound] 鍚屾澶辫触", e);
+ // 娉ㄦ剰锛氳繖閲屽彲浠ラ�夋嫨鎶涘嚭寮傚父鍥炴粴锛屾垨浠呰褰曟棩蹇�
+ // throw exception(PURCHASE_IN_SYNC_WMS_FAIL);
+ }
}
@Override
@@ -216,13 +242,15 @@
}
private List<ErpPurchaseInItemDO> validatePurchaseInItems(List<ErpPurchaseInSaveReqVO.Item> list) {
- // 1. 鏍￠獙浜у搧瀛樺湪
- List<ErpProductDO> productList = productService.validProductList(
- convertSet(list, ErpPurchaseInSaveReqVO.Item::getProductId));
- Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
+ // 1. 鏍￠獙鐗╂枡瀛樺湪锛堢墿鏂欎富鏁版嵁宸茶縼绉诲埌 MDM锛�
+ Set<Long> productIds = convertSet(list, ErpPurchaseInSaveReqVO.Item::getProductId);
+ Map<Long, MdmItemRespDTO> itemMap = productIds.isEmpty() ? Collections.emptyMap() : mdmItemApi.getItemMap(productIds);
+ if (itemMap.size() != productIds.size()) {
+ throw exception(PRODUCT_NOT_EXISTS);
+ }
// 2. 杞寲涓� ErpPurchaseInItemDO 鍒楄〃
return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseInItemDO.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;
@@ -319,85 +347,6 @@
return Collections.emptyList();
}
return purchaseInItemMapper.selectListByInIds(inIds);
- }
-
- // ==================== BPM 娴佺▼瀹℃壒 ====================
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void submitPurchaseIn(Long id, Long userId) {
- // 1. 鏍￠獙閲囪喘鍏ュ簱澶勪簬鑽夌鐘舵��
- ErpPurchaseInDO purchaseIn = validatePurchaseInExists(id);
- if (ObjectUtil.notEqual(purchaseIn.getStatus(), ErpAuditStatus.DRAFT.getStatus())) {
- throw exception(PURCHASE_IN_SUBMIT_FAIL_NOT_DRAFT);
- }
-
- // 2. 鍒涘缓閲囪喘鍏ュ簱瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
- .setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊閲囪喘鍏ュ簱宸ヤ綔娴佺紪鍙枫�佺姸鎬�
- purchaseInMapper.updateById(new ErpPurchaseInDO()
- .setId(id)
- .setProcessInstanceId(processInstanceId)
- .setStatus(ErpAuditStatus.PROCESS.getStatus()));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updatePurchaseInAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍￠獙閲囪喘鍏ュ簱瀛樺湪
- ErpPurchaseInDO purchaseIn = validatePurchaseInExists(id);
-
- // 2. 鏍￠獙閲囪喘鍏ュ簱澶勪簬瀹℃壒涓�
- if (ObjectUtil.notEqual(purchaseIn.getStatus(), ErpAuditStatus.PROCESS.getStatus())) {
- log.error("[updatePurchaseInAuditStatus][purchaseIn({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- purchaseIn.getId(), bpmResult);
- throw exception(PURCHASE_IN_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
-
- // 3. 鏇存柊閲囪喘鍏ュ簱瀹℃壒缁撴灉
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- purchaseInMapper.updateById(new ErpPurchaseInDO()
- .setId(id)
- .setStatus(auditStatus));
-
- // 4. 瀹℃壒閫氳繃鏃跺彉鏇村簱瀛�
- if (ErpAuditStatus.APPROVE.getStatus().equals(auditStatus)) {
- List<ErpPurchaseInItemDO> purchaseInItems = purchaseInItemMapper.selectListByInId(id);
- purchaseInItems.forEach(purchaseInItem -> {
- ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
- stockRecordBO.setProductId(purchaseInItem.getProductId());
- stockRecordBO.setWarehouseId(purchaseInItem.getWarehouseId());
- stockRecordBO.setCount(purchaseInItem.getCount());
- stockRecordBO.setBizType(ErpStockRecordBizTypeEnum.PURCHASE_IN.getType());
- stockRecordBO.setBizId(purchaseInItem.getInId());
- stockRecordBO.setBizItemId(purchaseInItem.getId());
- stockRecordBO.setBizNo(purchaseIn.getNo());
- stockRecordService.createStockRecord(stockRecordBO);
- });
- }
- }
-
- /**
- * 灏� BPM 瀹℃壒缁撴灉杞崲涓� ERP 瀹℃壒鐘舵��
- *
- * @param bpmResult BPM 瀹℃壒缁撴灉
- * @return ERP 瀹℃壒鐘舵��
- */
- private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
- // BPM 瀹℃壒缁撴灉锛�2=閫氳繃锛�3=涓嶉�氳繃锛�4=宸插彇娑�
- if (bpmResult == 2) {
- return ErpAuditStatus.APPROVE.getStatus();
- } else if (bpmResult == 3) {
- return ErpAuditStatus.REJECT.getStatus();
- } else if (bpmResult == 4) {
- return ErpAuditStatus.DRAFT.getStatus();
- } else {
- log.warn("[convertBpmResultToAuditStatus][鏈煡鐨� BPM 瀹℃壒缁撴灉({})]", bpmResult);
- return ErpAuditStatus.PROCESS.getStatus();
- }
}
}
--
Gitblit v1.9.3