From d89c7b53b14d9815afa01e8c53992eb60ea829d4 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 15 Jan 2026 15:12:44 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-15=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/oa/dto/SalesReturnBatchRequestDto.java       | 2 +-
 .../com/gaotao/modules/oa/dto/SalesReturnItemDto.java    | 2 ++
 .../oa/service/impl/SalesReturnApiServiceImpl.java       | 9 +++++----
 src/main/resources/mapper/pms/QcBaseInfoMapper.xml       | 9 ++++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java b/src/main/java/com/gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java
index e3b3b66..578351e 100644
--- a/src/main/java/com/gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java
+++ b/src/main/java/com/gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java
@@ -22,7 +22,7 @@ public class SalesReturnBatchRequestDto {
     /**
      * 销售退货订单号
      */
-    @NotBlank(message = "销售退货订单号不能为空")
+   // @NotBlank(message = "销售退货订单号不能为空")
     private String relatedOrderNo;
 
     /**
diff --git a/src/main/java/com/gaotao/modules/oa/dto/SalesReturnItemDto.java b/src/main/java/com/gaotao/modules/oa/dto/SalesReturnItemDto.java
index eef10f9..f13991c 100644
--- a/src/main/java/com/gaotao/modules/oa/dto/SalesReturnItemDto.java
+++ b/src/main/java/com/gaotao/modules/oa/dto/SalesReturnItemDto.java
@@ -98,5 +98,7 @@ public class SalesReturnItemDto {
      */
     @NotBlank(message = "客户编码不能为空")
     private String customerId;
+
+    private String relatedOrderNo;
 }
 
diff --git a/src/main/java/com/gaotao/modules/oa/service/impl/SalesReturnApiServiceImpl.java b/src/main/java/com/gaotao/modules/oa/service/impl/SalesReturnApiServiceImpl.java
index 01572bf..c33bfed 100644
--- a/src/main/java/com/gaotao/modules/oa/service/impl/SalesReturnApiServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/oa/service/impl/SalesReturnApiServiceImpl.java
@@ -44,8 +44,8 @@ public class SalesReturnApiServiceImpl implements SalesReturnApiService {
     @Transactional
     public OaResponseDto processSalesReturn(SalesReturnBatchRequestDto request) {
         try {
-            log.info("开始批量处理销售退货单推送请求，订单类型: {}, 销售退货订单号: {}, 订单数量: {}", 
-                    request.getOrderType(), request.getRelatedOrderNo(), request.getOrderList().size());
+            log.info("开始批量处理销售退货单推送请求，订单类型: {}, 订单数量: {}",
+                    request.getOrderType(), request.getOrderList().size());
 
             // 1. 参数验证
             if (!StringUtils.hasText(request.getOrderType()) ||
@@ -73,7 +73,7 @@ public class SalesReturnApiServiceImpl implements SalesReturnApiService {
                     }
 
                     // 调用存储过程处理单个订单
-                    processSingleOrder(request.getOrderType(), request.getRelatedOrderNo(), item);
+                    processSingleOrder(request.getOrderType(), item);
                     successCount++;
                     log.info("销售退货单项[{}/{}]处理成功，通知单号: {}", i + 1, request.getOrderList().size(), item.getOrderNo());
 
@@ -107,7 +107,7 @@ public class SalesReturnApiServiceImpl implements SalesReturnApiService {
     /**
      * 处理单个销售退货单
      */
-    private void processSingleOrder(String orderType, String relatedOrderNo, SalesReturnItemDto item) throws Exception {
+    private void processSingleOrder(String orderType, SalesReturnItemDto item) throws Exception {
         // 调用存储过程执行
         String site = item.getSite();
         String buNo = item.getBuNo();
@@ -130,6 +130,7 @@ public class SalesReturnApiServiceImpl implements SalesReturnApiService {
         String orderref4 = "";
         String orderref5 = "";
         String interfaceName = "销售退货单接口";
+        String relatedOrderNo = item.getRelatedOrderNo() != null ? item.getRelatedOrderNo() : "";
         
         List<Object> params = new ArrayList<>();
         params.add(site);
diff --git a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml
index d849437..7ad05c1 100644
--- a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml
+++ b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml
@@ -1801,7 +1801,14 @@
     <select id="getAllOperationDescList" parameterType="java.util.Map" resultType="java.lang.String">
         SELECT DISTINCT operationDesc
         FROM RoutingDetail
-        WHERE site = #{site}
+        <where>
+            <if test = "site != null and site != ''">
+                and site = #{site}
+            </if>
+            <if test = "userName != null and userName != ''">
+                and site in (select site from AccessSite where userID = #{userName})
+            </if>
+        </where>
         ORDER BY operationDesc
     </select>