From 14c80fbd16a51a355138345ecf69df9ca37746bf Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 06 十一月 2026 09:18:32 +0800
Subject: [PATCH] 完善售后退货联动和订单作废保护

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java                            |   11 ++
 sql/mysql/after_sale_finance_draft_menu_20261105.sql                                                                         |   19 ++++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java                                     |    2 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java           |   12 +++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java                         |    9 ++
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java   |   30 +++++++
 yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApi.java                                 |    5 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java       |   22 +++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java           |   30 +++++-
 sql/mysql/after_sale_return_qc_menu_20261105.sql                                                                             |    8 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java                      |   13 +++
 yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesLineCreateDTO.java        |   15 +++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java |    5 +
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApiImpl.java                                 |   19 ++++
 yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java                      |    3 
 yudao-module-mes/pom.xml                                                                                                     |    5 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java             |    2 
 sql/mysql/after_sale_return_mes_link_20261105.sql                                                                            |   11 ++
 18 files changed, 204 insertions(+), 17 deletions(-)

diff --git a/sql/mysql/after_sale_finance_draft_menu_20261105.sql b/sql/mysql/after_sale_finance_draft_menu_20261105.sql
index 7aaa361..6dafee6 100644
--- a/sql/mysql/after_sale_finance_draft_menu_20261105.sql
+++ b/sql/mysql/after_sale_finance_draft_menu_20261105.sql
@@ -1,9 +1,24 @@
--- 鍦ㄨ储鍔$鐞嗕笅澧炲姞鐙珛瀹℃牳鑽夌鍏ュ彛锛涜鑹叉潈闄愬湪鐩爣绯荤粺涓樉寮忓垎閰嶃��
-SET @finance_parent := (SELECT id FROM system_menu WHERE path='finance' AND type=1 AND deleted=b'0' AND name='璐㈠姟绠$悊' LIMIT 1);
+-- 鍏ュ彛褰掑叆鏃㈡湁鍞悗绠$悊涓�绾ц彍鍗曪紝涓嶆柊澧炴垨淇敼涓�绾ц彍鍗曘��
+-- 鐩存帴鎵ц鍚庨渶鎸夌洰鏍囩幆澧冭繍缁存祦绋嬪埛鏂扮浉鍏宠彍鍗曞強瑙掕壊鏉冮檺缂撳瓨銆�
+SET @finance_parent := (SELECT id FROM system_menu WHERE path='/aftersales' AND parent_id=0 AND type=1 AND deleted=b'0' LIMIT 1);
 INSERT INTO system_menu (name,permission,type,sort,parent_id,path,icon,component,component_name,status,visible,keep_alive,always_show,creator,updater)
 SELECT '鍞悗璐㈠姟鑽夌','',2,30,@finance_parent,'after-sale-draft','lucide:file-check','erp/finance/after-sale-draft/index','ErpAfterSaleFinanceDraft',0,b'1',b'1',b'1','1','1'
 WHERE @finance_parent IS NOT NULL AND NOT EXISTS(SELECT 1 FROM system_menu WHERE component='erp/finance/after-sale-draft/index' AND deleted=b'0');
 SET @finance_page := (SELECT id FROM system_menu WHERE component='erp/finance/after-sale-draft/index' AND deleted=b'0' LIMIT 1);
+-- 鍏煎鍏堝墠瀹夎鍒� ERP 璐㈠姟绠$悊涓嬬殑鐗堟湰锛屼粎绉诲姩宸茬煡鐨勬棫鍏ュ彛銆�
+UPDATE system_menu SET parent_id=@finance_parent, path='after-sale-draft', updater='1', update_time=NOW()
+WHERE id=@finance_page AND @finance_parent IS NOT NULL AND parent_id IN
+ (SELECT id FROM (SELECT f.id FROM system_menu f JOIN system_menu e ON f.parent_id=e.id
+   WHERE f.path='finance' AND e.path='/erp' AND e.parent_id=0 AND f.deleted=b'0' AND e.deleted=b'0') old_parent);
+-- 鍘熸湁鑽夌浣跨敤瑙掕壊闇�瑕佸敭鍚庣鐞嗙洰褰曟墠鑳界湅鍒板凡鎺堟潈鐨勯〉闈€��
+INSERT INTO system_role_menu (role_id,menu_id,creator,updater,tenant_id)
+SELECT DISTINCT rm.role_id,@finance_parent,'1','1',rm.tenant_id
+FROM system_role_menu rm
+WHERE @finance_parent IS NOT NULL AND @finance_page IS NOT NULL AND rm.deleted=b'0'
+  AND rm.menu_id=@finance_page
+  AND NOT EXISTS (SELECT 1 FROM system_role_menu existing
+    WHERE existing.role_id=rm.role_id AND existing.tenant_id=rm.tenant_id
+      AND existing.menu_id=@finance_parent AND existing.deleted=b'0');
 INSERT INTO system_menu (name,permission,type,sort,parent_id,path,icon,status,visible,keep_alive,always_show,creator,updater)
 SELECT p.name,p.permission,3,p.sort_no,@finance_page,'','',0,b'1',b'1',b'1','1','1'
 FROM (SELECT '鑽夌鏌ヨ' name,'erp:after-sale-finance:query' permission,1 sort_no UNION ALL SELECT '鑽夌瀹℃牳','erp:after-sale-finance:review',2) p
diff --git a/sql/mysql/after_sale_return_mes_link_20261105.sql b/sql/mysql/after_sale_return_mes_link_20261105.sql
new file mode 100644
index 0000000..9308fac
--- /dev/null
+++ b/sql/mysql/after_sale_return_mes_link_20261105.sql
@@ -0,0 +1,11 @@
+-- MES 閫�璐у崟鍏宠仈鍞悗鐢宠銆傞暱杈夌嚎涓婂拰鏈湴宸插瓨鍦ㄦ鍒楋紱
+-- 鍏朵粬椤圭洰杩佺Щ鏃跺畨鍏ㄨˉ鍒楋紝涓嶅洖濉巻鍙叉暟鎹��
+SET @as_return_link_sql := IF(
+  (SELECT COUNT(*) FROM information_schema.columns
+   WHERE table_schema=DATABASE() AND table_name='mes_wm_return_sales'
+     AND column_name='after_sale_return_id')=0,
+  'ALTER TABLE mes_wm_return_sales ADD COLUMN after_sale_return_id BIGINT NULL COMMENT ''鏉ユ簮鍞悗閫�璐х敵璇�''',
+  'SELECT 1');
+PREPARE as_return_link_stmt FROM @as_return_link_sql;
+EXECUTE as_return_link_stmt;
+DEALLOCATE PREPARE as_return_link_stmt;
diff --git a/sql/mysql/after_sale_return_qc_menu_20261105.sql b/sql/mysql/after_sale_return_qc_menu_20261105.sql
new file mode 100644
index 0000000..5f1ca63
--- /dev/null
+++ b/sql/mysql/after_sale_return_qc_menu_20261105.sql
@@ -0,0 +1,8 @@
+-- 鍞悗瀹炵墿閫�璐ч渶瑕� RQC 妫�楠屻�備粎鍚敤璐ㄩ噺绠$悊涓嬪凡鏈夌殑閫�璐ф楠岄〉闈紝
+-- 涓嶈皟鏁翠竴绾ц彍鍗曪紝涓嶆柊澧炵敤鎴锋垨瑙掕壊鎺堟潈銆傛墽琛屽悗鎸夌幆澧冭繍缁存祦绋嬪埛鏂版潈闄愮紦瀛樸��
+UPDATE system_menu
+SET status=0, visible=b'1', updater='1', update_time=NOW()
+WHERE component='mes/qc/rqc/index' AND type=2 AND deleted=b'0'
+  AND (status<>0 OR visible<>b'1')
+  AND parent_id IN (SELECT id FROM (SELECT id FROM system_menu
+       WHERE parent_id=0 AND path='/qc' AND deleted=b'0') qc_parent);
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java
index ed5fcd6..75c14df 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java
@@ -20,6 +20,8 @@
 import cn.iocoder.yudao.module.aftersales.service.permission.bo.AfterSalePermissionCreateReqBO;
 import cn.iocoder.yudao.module.mes.api.returnsales.MesWmReturnSalesApi;
 import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesCreateReqDTO;
+import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesLineCreateDTO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -33,6 +35,7 @@
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
 import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.*;
 
 /**
@@ -62,6 +65,8 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createReturn(AfterSaleReturnSaveReqVO createReqVO, Long userId) {
+        if (Integer.valueOf(3).equals(createReqVO.getReturnType()))
+            throw invalidParamException("浠呴��娆炬祦绋嬪皻鏈帴鍏ヨ储鍔″鏍革紝鏆備笉鑳藉垱寤洪��璐х敵璇�");
         // 1. 鏍¢獙宸ュ崟瀛樺湪
         AfterSaleTicketDO ticket = ticketMapper.selectById(createReqVO.getTicketId());
         if (ticket == null) {
@@ -122,6 +127,18 @@
         if (!AfterSaleReturnStatusEnum.DRAFT.getStatus().equals(returnDO.getStatus())) {
             throw exception(RETURN_APPROVE_FAIL);
         }
+        if (Integer.valueOf(3).equals(returnDO.getReturnType()))
+            throw invalidParamException("浠呴��娆炬祦绋嬪皻鏈帴鍏ヨ储鍔″鏍革紝鏆備笉鑳藉悓姝ヤ负瀹炵墿閫�璐у崟");
+        List<AfterSaleReturnItemDO> items = returnItemMapper.selectListByReturnId(id);
+        if (CollUtil.isEmpty(items) || items.stream().anyMatch(item -> item.getItemId() == null
+                || item.getReturnQuantity() == null || item.getReturnQuantity().signum() <= 0))
+            throw invalidParamException("璇峰厛濉啓鏈夋晥鐨勯��璐х墿鏂欏強鏁伴噺");
+        // 鍦ㄤ簨鍔′腑鎶㈠崰鑽夌鐘舵�侊紝閬垮厤骞跺彂瀹℃牳閲嶅鐢熸垚閫�璐у崟銆�
+        if (returnMapper.update(null, new LambdaUpdateWrapper<AfterSaleReturnDO>()
+                .eq(AfterSaleReturnDO::getId, id)
+                .eq(AfterSaleReturnDO::getStatus, AfterSaleReturnStatusEnum.DRAFT.getStatus())
+                .set(AfterSaleReturnDO::getStatus, AfterSaleReturnStatusEnum.AUDITING.getStatus())) != 1)
+            throw exception(RETURN_APPROVE_FAIL);
 
         // 2. 鑾峰彇鍏宠仈宸ュ崟锛堢敤浜庤幏鍙栭攢鍞鍗曞彿绛夊啑浣欎俊鎭級
         AfterSaleTicketDO ticket = ticketMapper.selectById(returnDO.getTicketId());
@@ -138,13 +155,22 @@
         mesReqDTO.setRemark("鍞悗宸ュ崟閫�璐� - 宸ュ崟鍙�: " + (ticket != null ? ticket.getNo() : ""));
         mesReqDTO.setAfterSaleReturnId(returnDO.getId());
         Long mesReturnId = mesWmReturnSalesApi.createReturnSales(mesReqDTO);
+        if (mesReturnId == null) throw invalidParamException("MES 閫�璐у崟鍒涘缓澶辫触");
+        for (AfterSaleReturnItemDO item : items) {
+            var line = new MesWmReturnSalesLineCreateDTO();
+            line.setReturnId(mesReturnId); line.setItemId(item.getItemId()); line.setQuantity(item.getReturnQuantity());
+            line.setBatchId(item.getBatchId()); line.setBatchCode(item.getBatchCode()); line.setRemark(item.getRemark());
+            Long lineId = mesWmReturnSalesApi.createReturnSalesLine(line);
+            if (lineId == null || returnItemMapper.updateById(new AfterSaleReturnItemDO().setId(item.getId()).setMesReturnLineId(lineId)) != 1)
+                throw invalidParamException("MES 閫�璐ф槑缁嗗悓姝ュけ璐�");
+        }
 
         // 4. 鏇存柊閫�璐х敵璇风姸鎬�
-        returnMapper.updateById(new AfterSaleReturnDO().setId(id)
+        if (returnMapper.updateById(new AfterSaleReturnDO().setId(id)
                 .setStatus(AfterSaleReturnStatusEnum.APPROVED.getStatus())
                 .setMesReturnId(mesReturnId)
                 .setMesReturnCode(returnDO.getNo())
-                .setAuditTime(LocalDateTime.now()));
+                .setAuditTime(LocalDateTime.now())) != 1) throw invalidParamException("鏇存柊閫�璐х敵璇峰け璐�");
     }
 
     @Override
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApi.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApi.java
index 3db589a..714f17c 100644
--- a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApi.java
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApi.java
@@ -33,6 +33,9 @@
      */
     CommonResult<ErpSaleOrderRespDTO> getSaleOrder(Long id);
 
+    /** 鍦ㄨ皟鐢ㄦ柟浜嬪姟涓攣瀹氬苟鏍¢獙鍙敤浜庡彂璐х殑閿�鍞鍗曘�� */
+    CommonResult<ErpSaleOrderRespDTO> lockSaleOrderForNotice(Long id, String orderNo);
+
     /**
      * 鏍规嵁鍚堝悓缂栧彿鑾峰彇閿�鍞鍗�
      *
@@ -80,4 +83,4 @@
      */
     CommonResult<Boolean> updateOrderOutStatusTo(Long orderId, Integer outStatus);
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApiImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApiImpl.java
index 08a9a10..bd0354a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApiImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderApiImpl.java
@@ -13,6 +13,10 @@
 import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import java.util.Objects;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,6 +25,7 @@
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
 
 /**
  * ERP 閿�鍞鍗� API 瀹炵幇绫�
@@ -57,6 +62,18 @@
     @Override
     public CommonResult<ErpSaleOrderRespDTO> getSaleOrder(Long id) {
         ErpSaleOrderDO order = saleOrderService.getSaleOrder(id);
+        return success(BeanUtils.toBean(order, ErpSaleOrderRespDTO.class));
+    }
+
+    @Override
+    @Transactional(propagation = Propagation.MANDATORY)
+    public CommonResult<ErpSaleOrderRespDTO> lockSaleOrderForNotice(Long id, String orderNo) {
+        if (id == null && (orderNo == null || orderNo.isBlank())) return success(null);
+        ErpSaleOrderDO order = id != null ? saleOrderMapper.selectByIdForUpdate(id) : saleOrderMapper.selectByNoForUpdate(orderNo);
+        if (order == null || (orderNo != null && !orderNo.isBlank() && !Objects.equals(orderNo, order.getNo())))
+            throw invalidParamException("鍏宠仈閿�鍞鍗曚笉瀛樺湪鎴栬鍗曠紪鍙蜂笉鍖归厤");
+        if (!Objects.equals(order.getStatus(), ErpAuditStatus.APPROVE.getStatus()))
+            throw invalidParamException("閿�鍞鍗曟湭瀹℃牳鎴栧凡浣滃簾锛屼笉鑳界敓鎴愬彂璐ч�氱煡");
         return success(BeanUtils.toBean(order, ErpSaleOrderRespDTO.class));
     }
 
@@ -121,4 +138,4 @@
         return success(true);
     }
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
index ac6dc97..e3a03cc 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
@@ -5,6 +5,7 @@
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderItemDO;
@@ -80,8 +81,16 @@
         return selectOne(ErpSaleOrderDO::getNo, no);
     }
 
+    default ErpSaleOrderDO selectByIdForUpdate(Long id) {
+        return selectOne(new LambdaQueryWrapperX<ErpSaleOrderDO>().eq(ErpSaleOrderDO::getId, id).last("FOR UPDATE"));
+    }
+
+    default ErpSaleOrderDO selectByNoForUpdate(String no) {
+        return selectOne(new LambdaQueryWrapperX<ErpSaleOrderDO>().eq(ErpSaleOrderDO::getNo, no).last("FOR UPDATE"));
+    }
+
     default ErpSaleOrderDO selectByContractId(Long contractId) {
         return selectOne(ErpSaleOrderDO::getContractId, contractId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
index 9857c8f..fad7682 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
@@ -102,6 +102,8 @@
     ErrorCode SALE_ORDER_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_020_201_020, "閿�鍞鍗曞鏍稿垎绫讳笅娌℃湁鍙敤鐨勬祦绋嬫ā鍨嬶紝璇峰厛鍒涘缓骞跺彂甯冩祦绋�");
     ErrorCode SALE_ORDER_CANCEL_FAIL_ACTIVE_MPS = new ErrorCode(1_020_201_021, "浣滃簾澶辫触锛岃鍗曚粛鏈夊叧鑱旂敓浜ц鍒掞紝璇峰厛澶勭悊骞跺彇娑堢敓浜ц鍒�");
     ErrorCode SALE_ORDER_CANCEL_FAIL_MPS_UNKNOWN = new ErrorCode(1_020_201_022, "鏃犳硶纭鍏宠仈鐢熶骇璁″垝鐘舵�侊紝璇风◢鍚庨噸璇�");
+    ErrorCode SALE_ORDER_CANCEL_FAIL_NOTICE_EXISTS = new ErrorCode(1_020_201_023, "浣滃簾澶辫触锛岃鍗曞凡鐢熸垚鍙戣揣閫氱煡锛岃鍏堝鐞嗙浉鍏抽�氱煡鍗�");
+    ErrorCode SALE_ORDER_CANCEL_FAIL_NOTICE_UNKNOWN = new ErrorCode(1_020_201_024, "鏃犳硶纭鍙戣揣閫氱煡鐘舵�侊紝璇风◢鍚庨噸璇�");
 
     // ========== ERP 閿�鍞嚭搴擄紙1-030-202-000锛� ==========
     ErrorCode SALE_OUT_NOT_EXISTS = new ErrorCode(1_020_202_000, "閿�鍞嚭搴撳崟涓嶅瓨鍦�");
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index beec292..0ed408e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -35,6 +35,7 @@
 import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
 import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsCreateReqDTO;
 import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
+import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
 import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import com.mzt.logapi.starter.annotation.LogRecord;
@@ -109,6 +110,8 @@
     private MdmItemApi mdmItemApi;
     @Resource
     private MesProMpsApi mpsApi;
+    @Resource
+    private MesWmSalesNoticeApi salesNoticeApi;
 
     @Resource
     private StorageAttachmentApi storageAttachmentApi;
@@ -594,7 +597,8 @@
     @Transactional(rollbackFor = Exception.class)
     public void cancelSaleOrder(Long id) {
         // 1.1 鏍¢獙瀛樺湪
-        ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
+        ErpSaleOrderDO saleOrder = saleOrderMapper.selectByIdForUpdate(id);
+        if (saleOrder == null) throw exception(SALE_ORDER_NOT_EXISTS);
         // 1.2 鏍¢獙鐘舵�侊細鍙湁宸插鏍哥殑璁㈠崟鎵嶈兘浣滃簾
         if (!ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
             throw exception(SALE_ORDER_CANCEL_FAIL_NOT_APPROVE, saleOrder.getNo());
@@ -615,6 +619,9 @@
                 throw exception(SALE_ORDER_CANCEL_FAIL_ACTIVE_MPS);
             }
         }
+        Map<Long, Boolean> noticeStatus = salesNoticeApi.checkSalesNoticeBySaleOrderIds(List.of(id));
+        if (noticeStatus == null || noticeStatus.get(id) == null) throw exception(SALE_ORDER_CANCEL_FAIL_NOTICE_UNKNOWN);
+        if (Boolean.TRUE.equals(noticeStatus.get(id))) throw exception(SALE_ORDER_CANCEL_FAIL_NOTICE_EXISTS);
 
         // 2. 鏇存柊鐘舵�佷负宸蹭綔搴�
         int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java
index a2ac506..8a75cd7 100644
--- a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.api.returnsales;
 
 import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesCreateReqDTO;
+import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesLineCreateDTO;
 
 /**
  * MES 閿�鍞��璐у崟 API 鎺ュ彛
@@ -17,4 +18,6 @@
      */
     Long createReturnSales(MesWmReturnSalesCreateReqDTO reqDTO);
 
+    Long createReturnSalesLine(MesWmReturnSalesLineCreateDTO reqDTO);
+
 }
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesLineCreateDTO.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesLineCreateDTO.java
new file mode 100644
index 0000000..4a1de4b
--- /dev/null
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesLineCreateDTO.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.mes.api.returnsales.dto;
+
+import lombok.Data;
+import java.math.BigDecimal;
+
+/** 鍞悗鐢宠鍚屾鍒� MES 鐨勯��璐х墿鏂欒銆� */
+@Data
+public class MesWmReturnSalesLineCreateDTO {
+    private Long returnId;
+    private Long itemId;
+    private BigDecimal quantity;
+    private Long batchId;
+    private String batchCode;
+    private String remark;
+}
diff --git a/yudao-module-mes/pom.xml b/yudao-module-mes/pom.xml
index c803320..63dd8ac 100644
--- a/yudao-module-mes/pom.xml
+++ b/yudao-module-mes/pom.xml
@@ -20,6 +20,11 @@
     <dependencies>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-aftersales-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-module-system</artifactId>
             <version>${revision}</version>
         </dependency>
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
index a37bba7..cf1876f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
@@ -2,8 +2,11 @@
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesCreateReqDTO;
+import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesLineCreateDTO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesService;
+import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +20,8 @@
 
     @Resource
     private MesWmReturnSalesService returnSalesService;
+    @Resource
+    private MesWmReturnSalesLineService returnSalesLineService;
 
     @Override
     public Long createReturnSales(MesWmReturnSalesCreateReqDTO reqDTO) {
@@ -24,4 +29,12 @@
         return returnSalesService.createReturnSales(createReqVO);
     }
 
+    @Override
+    public Long createReturnSalesLine(MesWmReturnSalesLineCreateDTO reqDTO) {
+        MesWmReturnSalesLineSaveReqVO line = BeanUtils.toBean(reqDTO, MesWmReturnSalesLineSaveReqVO.class);
+        // 鍞悗閫�鍥炵墿鏂欓』缁忚繃妫�楠岋紝涓嶈兘鎸夆�滀笉闇�妫�楠屸�濊嚜鍔ㄥ垽涓哄悎鏍笺��
+        line.setRqcCheckFlag(true);
+        return returnSalesLineService.createReturnSalesLine(line);
+    }
+
 }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
index b77d34f..544c2b9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
@@ -4,6 +4,7 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.time.LocalDate;
 
@@ -45,6 +46,10 @@
     @NotBlank(message = "閫�璐у師鍥犱笉鑳戒负绌�")
     private String returnReason;
 
+    /** 浠呬緵鏈嶅姟绔敭鍚庤仈鍔ㄨ缃紝涓嶈兘浠庢櫘閫氫粨搴撻��璐у崟鎺ュ彛浼犲叆銆� */
+    @JsonIgnore
+    private Long afterSaleReturnId;
+
     @Schema(description = "澶囨敞", example = "澶囨敞")
     private String remark;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
index aa3bb74..e8861f8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
@@ -60,6 +60,8 @@
      * 閫�璐у師鍥�
      */
     private String returnReason;
+    /** 鏉ユ簮鍞悗閫�璐х敵璇凤紝鏅�氫粨搴撻��璐у崟涓虹┖銆� */
+    private Long afterSaleReturnId;
     /**
      * 鐘舵��
      *
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
index d56b908..1d77b1a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
@@ -14,16 +14,20 @@
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
 import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
 import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.MD_ITEM_BATCH_REQUIRED;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_SALES_LINE_NOT_EXISTS;
 
@@ -49,6 +53,8 @@
     @Resource
     @Lazy
     private MesWmReturnSalesDetailService returnSalesDetailService;
+    @Resource
+    private ObjectProvider<AfterSaleTicketApi> afterSaleTicketApiProvider;
 
     @Override
     public Long createReturnSalesLine(MesWmReturnSalesLineSaveReqVO createReqVO) {
@@ -169,6 +175,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateReturnSalesLineWhenRqcFinish(Long sourceLineId, Long sourceDocId, Integer checkResult,
                                                     BigDecimal qualifiedQuantity, BigDecimal unqualifiedQuantity) {
         MesWmReturnSalesLineDO sourceLine = validateReturnSalesLineExists(sourceLineId);
@@ -207,10 +214,21 @@
         // 2. 妫�鏌ラ��璐у崟涓嬫槸鍚﹁繕鏈夊緟妫�楠岀殑琛岋紝鑻ュ叏妫�瀹屽垯灏嗛��璐у崟鐘舵�佽涓�"寰呬笂鏋�"
         if (sourceDocId != null) {
             List<MesWmReturnSalesLineDO> allLines = returnSalesLineMapper.selectListByReturnId(sourceDocId);
-            boolean allInspected = !CollUtil.contains(allLines,
-                    line -> Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.PENDING.getStatus()));
+            boolean allInspected = CollUtil.isNotEmpty(allLines) && allLines.stream().allMatch(line ->
+                    Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus())
+                    || Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus()));
             if (allInspected) {
                 returnSalesService.updateReturnSalesStatus(sourceDocId, MesWmReturnSalesStatusEnum.APPROVING.getStatus());
+                MesWmReturnSalesDO source = returnSalesService.validateReturnSalesExists(sourceDocId);
+                if (source.getAfterSaleReturnId() != null) {
+                    AfterSaleTicketApi api = afterSaleTicketApiProvider.getIfAvailable();
+                    if (api == null) throw invalidParamException("鍞悗鏈嶅姟涓嶅彲鐢紝鏃犳硶鍚屾閫�璐ф楠岀粨鏋�");
+                    boolean hasFailed = allLines.stream().anyMatch(line ->
+                            Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus()));
+                    var response = api.onReturnQualityFinished(source.getAfterSaleReturnId(), hasFailed ? "瀛樺湪涓嶅悎鏍�" : "鍚堟牸", null);
+                    if (response == null || !Boolean.TRUE.equals(response.getCheckedData()))
+                        throw invalidParamException("鍞悗閫�璐ф楠岀粨鏋滃悓姝ュけ璐�");
+                }
             }
         }
     }
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..0675c27 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
@@ -19,12 +19,14 @@
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
 import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
 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;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
@@ -33,6 +35,7 @@
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
 
@@ -58,6 +61,8 @@
     private MesMdmItemService mdmItemService;
     @Resource
     private MesWmTransactionService wmTransactionService;
+    @Resource
+    private ObjectProvider<AfterSaleTicketApi> afterSaleTicketApiProvider;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -183,6 +188,13 @@
         // 3. 鏇存柊閫�璐у崟鐘舵��
         returnSalesMapper.updateById(new MesWmReturnSalesDO()
                 .setId(id).setStatus(MesWmReturnSalesStatusEnum.FINISHED.getStatus()));
+        if (returnSales.getAfterSaleReturnId() != null) {
+            AfterSaleTicketApi api = afterSaleTicketApiProvider.getIfAvailable();
+            if (api == null) throw invalidParamException("鍞悗鏈嶅姟涓嶅彲鐢紝鏃犳硶鍚屾閫�璐у叆搴撶姸鎬�");
+            var response = api.onReturnInboundFinished(returnSales.getAfterSaleReturnId());
+            if (response == null || !Boolean.TRUE.equals(response.getCheckedData()))
+                throw invalidParamException("鍞悗閫�璐у叆搴撶姸鎬佸悓姝ュけ璐�");
+        }
     }
 
     private void createTransactionList(MesWmReturnSalesDO returnSales) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index 0c03975..1314265 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -66,7 +66,9 @@
     private MesWmSalesNoticeLineMapper salesNoticeLineMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
+        lockReferencedSaleOrder(createReqVO, null);
         // 鏍¢獙鏁版嵁
         validateSalesNoticeSave(createReqVO);
 
@@ -78,9 +80,11 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateSalesNotice(MesWmSalesNoticeSaveReqVO updateReqVO) {
         // 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
-        validateSalesNoticeExistsAndDraft(updateReqVO.getId());
+        MesWmSalesNoticeDO existing = validateSalesNoticeExistsAndDraft(updateReqVO.getId());
+        lockReferencedSaleOrder(updateReqVO, existing);
         // 鏍¢獙鏁版嵁
         validateSalesNoticeSave(updateReqVO);
 
@@ -170,6 +174,21 @@
         }
     }
 
+    /** 涓庤鍗曚綔搴熶娇鐢ㄥ悓涓�璁㈠崟琛岄攣锛涙敮鎸佸巻鍙茶姹備粎浼犺鍗曞彿銆� */
+    private void lockReferencedSaleOrder(MesWmSalesNoticeSaveReqVO request, MesWmSalesNoticeDO existing) {
+        Long orderId = request.getSaleOrderId();
+        String orderNo = request.getSaleOrderCode();
+        if (orderId == null && (orderNo == null || orderNo.isBlank()) && existing != null) {
+            orderId = existing.getSaleOrderId();
+            orderNo = existing.getSaleOrderCode();
+        }
+        if (orderId == null && (orderNo == null || orderNo.isBlank())) return;
+        ErpSaleOrderRespDTO order = saleOrderApi.lockSaleOrderForNotice(orderId, orderNo).getCheckedData();
+        if (order == null) throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
+        request.setSaleOrderId(order.getId());
+        request.setSaleOrderCode(order.getNo());
+    }
+
     private void validateNoticeCodeUnique(Long id, String code) {
         MesWmSalesNoticeDO notice = salesNoticeMapper.selectByCode(code);
         if (notice == null) {
@@ -183,16 +202,13 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long generateSalesNoticeFromSaleOrder(Long saleOrderId) {
+        // 鍏堥攣瀹氳鍗曪紝鍐嶆鏌ラ�氱煡锛涗笌璁㈠崟浣滃簾涓茶鎵ц銆�
+        ErpSaleOrderRespDTO saleOrder = saleOrderApi.lockSaleOrderForNotice(saleOrderId, null).getCheckedData();
+        if (saleOrder == null) throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
         // 1. 鏍¢獙鏄惁宸茬敓鎴愯繃鍙戣揣閫氱煡鍗曪紙闃叉閲嶅鐢熸垚锛�
         MesWmSalesNoticeDO existNotice = salesNoticeMapper.selectBySaleOrderId(saleOrderId);
         if (existNotice != null) {
             throw exception(WM_SALES_NOTICE_ALREADY_EXISTS);
-        }
-
-        // 2. 鑾峰彇閿�鍞鍗曚俊鎭�
-        ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(saleOrderId).getCheckedData();
-        if (saleOrder == null) {
-            throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
         }
 
         // 3. 鑾峰彇閿�鍞鍗曟槑缁�

--
Gitblit v1.9.3