From 80ddf4c9c0bcb0f6c31524e0d9f5599c8001e904 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 10 七月 2026 13:29:38 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java | 174 +++++++++++++++++++++++++--------------------------------
1 files changed, 76 insertions(+), 98 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
index 45aad13..af646e1 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
@@ -5,8 +5,6 @@
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.sale.vo.out.ErpSaleOutPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.out.ErpSaleOutSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
@@ -20,8 +18,11 @@
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.product.mapping.ErpMdmMappingService;
import cn.iocoder.yudao.module.erp.service.stock.ErpStockRecordService;
import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
+import cn.iocoder.yudao.module.wms.api.dto.WmsSalesOutboundReqDTO;
+import cn.iocoder.yudao.module.wms.api.stock.WmsStockApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -31,6 +32,7 @@
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;
@@ -39,6 +41,8 @@
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 瀹炵幇绫�
@@ -49,11 +53,6 @@
@Validated
@Slf4j
public class ErpSaleOutServiceImpl implements ErpSaleOutService {
-
- /**
- * BPM 閿�鍞嚭搴撳鎵规祦绋嬫爣璇�
- */
- public static final String BPM_PROCESS_DEFINITION_KEY = "erp-sale-out-audit";
@Resource
private ErpSaleOutMapper saleOutMapper;
@@ -74,10 +73,13 @@
private ErpStockRecordService stockRecordService;
@Resource
- private AdminUserApi adminUserApi;
+ private WmsStockApi wmsStockApi;
@Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ private ErpMdmMappingService mdmMappingService;
+
+ @Resource
+ private AdminUserApi adminUserApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -100,7 +102,7 @@
// 2.1 鎻掑叆鍑哄簱
ErpSaleOutDO saleOut = BeanUtils.toBean(createReqVO, ErpSaleOutDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()))
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()))
.setOrderNo(saleOrder.getNo()).setCustomerId(saleOrder.getCustomerId());
calculateTotalPrice(saleOut, saleOutItems);
saleOutMapper.insert(saleOut);
@@ -199,16 +201,71 @@
: ErpStockRecordBizTypeEnum.SALE_OUT_CANCEL.getType();
saleOutItems.forEach(saleOutItem -> {
BigDecimal count = approve ? saleOutItem.getCount().negate() : saleOutItem.getCount();
- ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
- stockRecordBO.setProductId(saleOutItem.getProductId());
- stockRecordBO.setWarehouseId(saleOutItem.getWarehouseId());
- stockRecordBO.setCount(count);
- stockRecordBO.setBizType(bizType);
- stockRecordBO.setBizId(saleOutItem.getOutId());
- stockRecordBO.setBizItemId(saleOutItem.getId());
- stockRecordBO.setBizNo(saleOut.getNo());
- stockRecordService.createStockRecord(stockRecordBO);
+ stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
+ saleOutItem.getProductId(), saleOutItem.getWarehouseId(), count,
+ bizType, saleOutItem.getOutId(), saleOutItem.getId(), saleOut.getNo()));
});
+
+ // 4. 鍚屾 WMS 搴撳瓨锛圡ES 搴撳瓨锛�
+ if (approve) {
+ syncToWmsSalesOutbound(saleOut, saleOutItems);
+ }
+ }
+
+ /**
+ * 鍚屾閿�鍞嚭搴撳埌 WMS 搴撳瓨
+ */
+ private void syncToWmsSalesOutbound(ErpSaleOutDO saleOut, List<ErpSaleOutItemDO> saleOutItems) {
+ if (CollUtil.isEmpty(saleOutItems)) {
+ return;
+ }
+
+ log.info("[syncToWmsSalesOutbound] 寮�濮嬪悓姝ラ攢鍞嚭搴撳埌WMS锛宻aleOutId={}", saleOut.getId());
+
+ // 鏋勫缓鍑哄簱璇锋眰
+ WmsSalesOutboundReqDTO reqDTO = new WmsSalesOutboundReqDTO()
+ .setBizId(saleOut.getId())
+ .setBizCode(saleOut.getNo())
+ .setOutboundTime(LocalDateTime.now());
+
+ // 杞崲鏄庣粏椤�
+ List<WmsSalesOutboundReqDTO.Item> items = convertList(saleOutItems, item -> {
+ // ERP 浜у搧 ID -> MDM 鐗╂枡 ID
+ Long mdmItemId = mdmMappingService.getMdmItemId(item.getProductId());
+ // ERP 浠撳簱 ID -> MES 浠撳簱 ID
+ Long mesWarehouseId = mdmMappingService.getMesWarehouseId(item.getWarehouseId());
+
+ if (mdmItemId == null) {
+ log.warn("[syncToWmsSalesOutbound] 鏈壘鍒癕DM鐗╂枡鏄犲皠锛宔rpProductId={}", item.getProductId());
+ return null;
+ }
+ if (mesWarehouseId == null) {
+ log.warn("[syncToWmsSalesOutbound] 鏈壘鍒癕ES浠撳簱鏄犲皠锛宔rpWarehouseId={}", item.getWarehouseId());
+ return null;
+ }
+
+ return new WmsSalesOutboundReqDTO.Item()
+ .setItemId(mdmItemId)
+ .setWarehouseId(mesWarehouseId)
+ .setQuantity(item.getCount())
+ .setBizLineId(item.getId());
+ });
+
+ // 杩囨护鎺夋槧灏勫け璐ョ殑椤�
+ items = items.stream().filter(java.util.Objects::nonNull).toList();
+ if (CollUtil.isEmpty(items)) {
+ log.warn("[syncToWmsSalesOutbound] 鏃犳湁鏁堢殑鍑哄簱鏄庣粏锛岃烦杩嘩MS鍚屾");
+ return;
+ }
+
+ reqDTO.setItems(items);
+
+ try {
+ Long transactionId = wmsStockApi.salesOutbound(reqDTO);
+ log.info("[syncToWmsSalesOutbound] 鍚屾鎴愬姛锛宼ransactionId={}", transactionId);
+ } catch (Exception e) {
+ log.error("[syncToWmsSalesOutbound] 鍚屾澶辫触", e);
+ }
}
@Override
@@ -327,85 +384,6 @@
return Collections.emptyList();
}
return saleOutItemMapper.selectListByOutIds(outIds);
- }
-
- // ==================== BPM 娴佺▼瀹℃壒 ====================
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void submitSaleOut(Long id, Long userId) {
- // 1. 鏍￠獙閿�鍞嚭搴撳浜庤崏绋跨姸鎬�
- ErpSaleOutDO saleOut = validateSaleOutExists(id);
- if (ObjectUtil.notEqual(saleOut.getStatus(), ErpAuditStatus.DRAFT.getStatus())) {
- throw exception(SALE_OUT_SUBMIT_FAIL_NOT_DRAFT);
- }
-
- // 2. 鍒涘缓閿�鍞嚭搴撳鎵规祦绋嬪疄渚�
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
- .setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊閿�鍞嚭搴撳伐浣滄祦缂栧彿銆佺姸鎬�
- saleOutMapper.updateById(new ErpSaleOutDO()
- .setId(id)
- .setProcessInstanceId(processInstanceId)
- .setStatus(ErpAuditStatus.PROCESS.getStatus()));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateSaleOutAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍￠獙閿�鍞嚭搴撳瓨鍦�
- ErpSaleOutDO saleOut = validateSaleOutExists(id);
-
- // 2. 鏍￠獙閿�鍞嚭搴撳浜庡鎵逛腑
- if (ObjectUtil.notEqual(saleOut.getStatus(), ErpAuditStatus.PROCESS.getStatus())) {
- log.error("[updateSaleOutAuditStatus][saleOut({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- saleOut.getId(), bpmResult);
- throw exception(SALE_OUT_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
-
- // 3. 鏇存柊閿�鍞嚭搴撳鎵圭粨鏋�
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- saleOutMapper.updateById(new ErpSaleOutDO()
- .setId(id)
- .setStatus(auditStatus));
-
- // 4. 瀹℃壒閫氳繃鏃跺彉鏇村簱瀛橈紙鍑忓皯搴撳瓨锛�
- if (ErpAuditStatus.APPROVE.getStatus().equals(auditStatus)) {
- List<ErpSaleOutItemDO> saleOutItems = saleOutItemMapper.selectListByOutId(id);
- saleOutItems.forEach(saleOutItem -> {
- ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
- stockRecordBO.setProductId(saleOutItem.getProductId());
- stockRecordBO.setWarehouseId(saleOutItem.getWarehouseId());
- stockRecordBO.setCount(saleOutItem.getCount().negate());
- stockRecordBO.setBizType(ErpStockRecordBizTypeEnum.SALE_OUT.getType());
- stockRecordBO.setBizId(saleOutItem.getOutId());
- stockRecordBO.setBizItemId(saleOutItem.getId());
- stockRecordBO.setBizNo(saleOut.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