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 | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 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 f8af202..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
@@ -18,16 +18,21 @@
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;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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;
@@ -46,6 +51,7 @@
*/
@Service
@Validated
+@Slf4j
public class ErpSaleOutServiceImpl implements ErpSaleOutService {
@Resource
@@ -65,6 +71,12 @@
private ErpAccountService accountService;
@Resource
private ErpStockRecordService stockRecordService;
+
+ @Resource
+ private WmsStockApi wmsStockApi;
+
+ @Resource
+ private ErpMdmMappingService mdmMappingService;
@Resource
private AdminUserApi adminUserApi;
@@ -193,6 +205,67 @@
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
--
Gitblit v1.9.3