From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 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..af8ffcd 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,9 @@
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.AfterSaleWarehouseReturnStageReqDTO;
+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;
@@ -31,6 +34,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -58,6 +62,8 @@
private MesMdmItemService mdmItemService;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private AfterSaleTicketApi afterSaleTicketApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -69,6 +75,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();
}
@@ -152,12 +167,16 @@
@Transactional(rollbackFor = Exception.class)
public void stockReturnSales(Long id) {
// 1.1 鏍￠獙瀛樺湪 + 寰呬笂鏋剁姸鎬�
- MesWmReturnSalesDO returnSales = validateReturnSalesExists(id);
+ MesWmReturnSalesDO returnSales = returnSalesMapper.selectByIdForUpdate(id);
+ if (returnSales == null) throw exception(WM_RETURN_SALES_NOT_EXISTS);
if (ObjUtil.notEqual(MesWmReturnSalesStatusEnum.APPROVED.getStatus(), returnSales.getStatus())) {
throw exception(WM_RETURN_SALES_STATUS_NOT_APPROVED);
}
// 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 +184,20 @@
allDetails, MesWmReturnSalesDetailDO::getLineId);
// 妫�鏌ユ瘡琛岀殑鏄庣粏鏁伴噺
for (MesWmReturnSalesLineDO line : lines) {
+ if (line.getNcrDispositionId() != null && Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())) {
+ if (!detailMap.getOrDefault(line.getId(), Collections.emptyList()).isEmpty()) {
+ throw exception(WM_RETURN_SALES_LINE_NOT_QUALIFIED);
+ }
+ continue; // 涓嶅悎鏍兼暟閲忕敱 NCR 鐙珛澶勭悊锛屼笉鍦ㄥ師閫�璐у崟鍐嶆鍏ュ簱
+ }
+ 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() + " 鏈畬鎴愪笂鏋�");
@@ -183,6 +211,12 @@
// 3. 鏇存柊閫�璐у崟鐘舵��
returnSalesMapper.updateById(new MesWmReturnSalesDO()
.setId(id).setStatus(MesWmReturnSalesStatusEnum.FINISHED.getStatus()));
+ if (returnSales.getSaleOrderId() != null) {
+ afterSaleTicketApi.onWarehouseReturnInboundFinished(new AfterSaleWarehouseReturnStageReqDTO()
+ .setSaleOrderId(returnSales.getSaleOrderId())
+ .setReturnSalesId(returnSales.getId())
+ .setReturnSalesCode(returnSales.getCode()));
+ }
}
private void createTransactionList(MesWmReturnSalesDO returnSales) {
@@ -200,7 +234,8 @@
@Transactional(rollbackFor = Exception.class)
public void cancelReturnSales(Long id) {
// 鏍￠獙瀛樺湪
- MesWmReturnSalesDO returnSales = validateReturnSalesExists(id);
+ MesWmReturnSalesDO returnSales = returnSalesMapper.selectByIdForUpdate(id);
+ if (returnSales == null) throw exception(WM_RETURN_SALES_NOT_EXISTS);
// 宸插畬鎴愬拰宸插彇娑堜笉鍏佽鍙栨秷
if (ObjectUtils.equalsAny(returnSales.getStatus(),
MesWmReturnSalesStatusEnum.FINISHED.getStatus(),
@@ -217,6 +252,9 @@
public Boolean checkReturnSalesQuantity(Long id) {
List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(id);
for (MesWmReturnSalesLineDO line : lines) {
+ if (line.getNcrDispositionId() != null && Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())) {
+ continue;
+ }
List<MesWmReturnSalesDetailDO> details = returnSalesDetailService.getReturnSalesDetailListByLineId(line.getId());
BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,
MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
--
Gitblit v1.9.3