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

---
 .../controller/CrossAreaTransferController.java             | 2 +-
 .../service/impl/CrossAreaTransferServiceImpl.java          | 6 +++---
 .../mapper/productionReturn/ProductionReturnMapper.xml      | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/crossAreaTransfer/controller/CrossAreaTransferController.java b/src/main/java/com/gaotao/modules/crossAreaTransfer/controller/CrossAreaTransferController.java
index 2158b9d..97c7021 100644
--- a/src/main/java/com/gaotao/modules/crossAreaTransfer/controller/CrossAreaTransferController.java
+++ b/src/main/java/com/gaotao/modules/crossAreaTransfer/controller/CrossAreaTransferController.java
@@ -149,7 +149,7 @@ public class CrossAreaTransferController {
 
         } catch (Exception e) {
             logger.error("保存跨区调拨失败", e);
-            return R.error("保存调拨失败: " + e.getMessage());
+            return R.error(e.getMessage());
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/crossAreaTransfer/service/impl/CrossAreaTransferServiceImpl.java b/src/main/java/com/gaotao/modules/crossAreaTransfer/service/impl/CrossAreaTransferServiceImpl.java
index 29e6288..853efb2 100644
--- a/src/main/java/com/gaotao/modules/crossAreaTransfer/service/impl/CrossAreaTransferServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/crossAreaTransfer/service/impl/CrossAreaTransferServiceImpl.java
@@ -175,7 +175,7 @@ public class CrossAreaTransferServiceImpl extends ServiceImpl<CrossAreaTransferM
 
             if (!"200".equals(outboundCode)) {
                 String msg = String.valueOf(outboundResult.get("message"));
-                throw new RuntimeException("跨区调拨出库失败: " + msg);
+                throw new RuntimeException(msg);
             }
             
             // 获取出库返回的transNo，用于入库时传递
@@ -227,7 +227,7 @@ public class CrossAreaTransferServiceImpl extends ServiceImpl<CrossAreaTransferM
 
             if (!"200".equals(inboundCode)) {
                 String msg = String.valueOf(inboundResult.get("message"));
-                throw new RuntimeException("跨区调拨入库失败: " + msg);
+                throw new RuntimeException(msg);
             }
             
             // 如果入库返回的synced_flag为'Y'，则异步调用ERP接口
@@ -254,7 +254,7 @@ public class CrossAreaTransferServiceImpl extends ServiceImpl<CrossAreaTransferM
 
         } catch (Exception e) {
             logger.error("保存跨区调拨失败", e);
-            throw new RuntimeException("保存跨区调拨失败: " + e.getMessage());
+            throw new RuntimeException(e.getMessage());
         }
     }
 
diff --git a/src/main/resources/mapper/productionReturn/ProductionReturnMapper.xml b/src/main/resources/mapper/productionReturn/ProductionReturnMapper.xml
index 77d4c47..099f586 100644
--- a/src/main/resources/mapper/productionReturn/ProductionReturnMapper.xml
+++ b/src/main/resources/mapper/productionReturn/ProductionReturnMapper.xml
@@ -14,12 +14,15 @@
         sh.batch_no as batchNo,
         sh.LotSize as lotSize -- 订单数量
         from ShopOrder as sh
-        left join part as p on sh.site = p.site and sh.bu_no = p.bu_no and sh.PartNo = p.PartNo
+        inner join part as p on sh.site = p.site and sh.bu_no = p.bu_no and sh.PartNo = p.PartNo
+        left join inventory_stock i on sh.site = i.site and sh.orderNo = i.orderref1
         where sh.site = #{site} and sh.bu_no in (select bu_no from AccessBu where username = #{userName})
+        and consumed_flag = 'N' and (I.status ='待入' or i.status ='出库')
         <if test="searchCode != null and searchCode != ''">
             AND (
             sh.OrderNo LIKE CONCAT('%', #{searchCode}, '%')
             OR sh.PartNo LIKE CONCAT('%', #{searchCode}, '%')
+            OR i.roll_no LIKE CONCAT('%', #{searchCode}, '%')
             )
         </if>
         <if test="searchCode == null or searchCode == ''">