From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
index 57199ae..25418e3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
@@ -4,6 +4,8 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnCreateReqDTO;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
@@ -58,6 +60,8 @@
private MesMdmItemService mdmItemService;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private AfterSaleTicketApi afterSaleTicketApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -69,6 +73,15 @@
MesWmReturnSalesDO returnSales = BeanUtils.toBean(createReqVO, MesWmReturnSalesDO.class);
returnSales.setStatus(MesWmReturnSalesStatusEnum.PREPARE.getStatus());
returnSalesMapper.insert(returnSales);
+
+ // 3. 鍚屾鍏宠仈鍞悗宸ュ崟锛氫粨鍌ㄩ��璐х暀鐥� + 宸ュ崟杩涘叆寰呴��璐�
+ AfterSaleWarehouseReturnCreateReqDTO returnReqDTO = new AfterSaleWarehouseReturnCreateReqDTO();
+ returnReqDTO.setSaleOrderId(createReqVO.getSaleOrderId());
+ returnReqDTO.setReturnSalesId(returnSales.getId());
+ returnReqDTO.setReturnSalesCode(createReqVO.getCode());
+ returnReqDTO.setReturnReason(createReqVO.getReturnReason());
+ afterSaleTicketApi.onWarehouseReturnCreated(returnReqDTO);
+
return returnSales.getId();
}
@@ -158,6 +171,9 @@
}
// 1.2 妫�鏌ユ瘡涓鐨勬槑缁嗘暟閲忔槸鍚﹀畬鎴愪笂鏋�
List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(id);
+ if (CollUtil.isEmpty(lines)) {
+ throw exception(WM_RETURN_SALES_NO_LINE);
+ }
if (CollUtil.isNotEmpty(lines)) {
// 鎵归噺鏌ヨ鎵�鏈夋槑缁�
List<MesWmReturnSalesDetailDO> allDetails = returnSalesDetailService.getReturnSalesDetailListByReturnId(id);
@@ -165,11 +181,14 @@
allDetails, MesWmReturnSalesDetailDO::getLineId);
// 妫�鏌ユ瘡琛岀殑鏄庣粏鏁伴噺
for (MesWmReturnSalesLineDO line : lines) {
+ if (ObjUtil.notEqual(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus())) {
+ throw exception(WM_RETURN_SALES_LINE_NOT_QUALIFIED);
+ }
List<MesWmReturnSalesDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
// 瀵规瘮琛屾暟閲忎笌鏄庣粏鎬绘暟閲忥紝涓嶆弧瓒崇洿鎺ユ姏鍑�
- if (line.getQuantity().compareTo(totalDetailQuantity) > 0) {
+ if (line.getQuantity() == null || line.getQuantity().compareTo(totalDetailQuantity) != 0) {
MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(line.getItemId());
throw exception(WM_RETURN_SALES_DETAIL_QUANTITY_MISMATCH,
item.getCode() + " " + item.getName() + " 鏈畬鎴愪笂鏋�");
--
Gitblit v1.9.3