From 7a923e32e55e9c34830690341469cc170f65092e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 16 十一月 2026 09:32:35 +0800
Subject: [PATCH] feat: 完善销售和投标业务流程

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java |   89 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 74 insertions(+), 15 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 82abbb2..d226616 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,11 +4,15 @@
 
 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;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.detail.MesWmReturnSalesDetailSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDetailDO;
@@ -18,7 +22,7 @@
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
 import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -31,6 +35,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;
@@ -39,7 +44,7 @@
 /**
  * MES 閿�鍞��璐у崟 Service 瀹炵幇绫�
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Service
 @Validated
@@ -53,11 +58,13 @@
     @Resource
     private MesWmReturnSalesDetailService returnSalesDetailService;
     @Resource
-    private MesMdClientService clientService;
+    private CrmCustomerApi customerApi;
     @Resource
     private MesMdmItemService mdmItemService;
     @Resource
     private MesWmTransactionService wmTransactionService;
+    @Resource
+    private AfterSaleTicketApi afterSaleTicketApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -69,6 +76,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();
     }
 
@@ -106,7 +122,7 @@
 
     @Override
     public PageResult<MesWmReturnSalesDO> getReturnSalesPage(MesWmReturnSalesPageReqVO pageReqVO) {
-        return returnSalesMapper.selectPage(pageReqVO);
+        return returnSalesMapper.selectPage(pageReqVO, (List<Long>) null);
     }
 
     @Override
@@ -132,32 +148,56 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void finishReturnSales(Long id) {
-        // 1.1 鏍¢獙瀛樺湪 + 寰呮墽琛岀姸鎬�
-        MesWmReturnSalesDO returnSales = validateReturnSalesExists(id);
+    public void confirmReturnSales(Long id, Long warehouseId, Long locationId, Long areaId) {
+        if (warehouseId == null || locationId == null || areaId == null) {
+            throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "璇烽�夋嫨鍏ュ簱浠撳簱銆佸簱鍖哄拰搴撲綅");
+        }
+        MesWmReturnSalesDO returnSales = returnSalesMapper.selectByIdForUpdate(id);
+        if (returnSales == null) throw exception(WM_RETURN_SALES_NOT_EXISTS);
         if (ObjUtil.notEqual(MesWmReturnSalesStatusEnum.APPROVING.getStatus(), returnSales.getStatus())) {
             throw exception(WM_RETURN_SALES_STATUS_NOT_APPROVING);
         }
-        // 1.2 鏍¢獙鑷冲皯鏈変竴鏉¤
         List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(id);
-        if (CollUtil.isEmpty(lines)) {
-            throw exception(WM_RETURN_SALES_NO_LINE);
+        if (CollUtil.isEmpty(lines)) throw exception(WM_RETURN_SALES_NO_LINE);
+        if (CollUtil.isNotEmpty(returnSalesDetailService.getReturnSalesDetailListByReturnId(id))) {
+            throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "閫�璐у崟宸叉湁涓婃灦鏄庣粏锛岃鎸夊師娴佺▼瀹屾垚");
         }
-        // 2. 鎵ц閫�璐э紙寰呮墽琛� -> 寰呬笂鏋讹級
+        // 鏄庣粏鏈嶅姟浼氭牎楠岃川妫�缁撴灉銆佸簱浣嶅眰绾с�佹贩鏀捐鍒欏拰鎵规銆�
         returnSalesMapper.updateById(new MesWmReturnSalesDO()
                 .setId(id).setStatus(MesWmReturnSalesStatusEnum.APPROVED.getStatus()));
+        for (MesWmReturnSalesLineDO line : lines) {
+            if (line.getNcrDispositionId() != null
+                    && Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())) continue;
+            if (ObjUtil.notEqual(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus())) {
+                throw exception(WM_RETURN_SALES_LINE_NOT_QUALIFIED);
+            }
+            MesWmReturnSalesDetailSaveReqVO detail = new MesWmReturnSalesDetailSaveReqVO();
+            detail.setReturnId(id);
+            detail.setLineId(line.getId());
+            detail.setItemId(line.getItemId());
+            detail.setQuantity(line.getQuantity());
+            detail.setWarehouseId(warehouseId);
+            detail.setLocationId(locationId);
+            detail.setAreaId(areaId);
+            returnSalesDetailService.createReturnSalesDetail(detail);
+        }
+        stockReturnSales(id);
     }
 
     @Override
     @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 +205,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 +232,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 +255,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 +273,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);
@@ -272,7 +331,7 @@
      */
     private void validateSaveData(MesWmReturnSalesSaveReqVO reqVO) {
         validateCodeUnique(reqVO.getId(), reqVO.getCode());
-        clientService.validateClientExistsAndEnable(reqVO.getClientId());
+        customerApi.validateCustomer(reqVO.getClientId());
     }
 
 }

--
Gitblit v1.9.3