From 3ab5ce2be3c8b598b7b1d0216f22f0d491fe8e82 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Wed, 27 May 2026 17:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/wms/mapper/StRealtimeStockMapper.xml    | 2 ++
 .../wms/service/impl/StOtherOutRecordServiceImpl.java       | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRealtimeStockMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRealtimeStockMapper.xml
index e2c462ff8..144283348 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRealtimeStockMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRealtimeStockMapper.xml
@@ -316,6 +316,7 @@
         LEFT JOIN ST_STOREHOUSE h ON r.sh_id = h.id AND h.is_deleted = 0 AND h.id = #{shId}
         LEFT JOIN ST_STOCK_INOUT_RECORD io ON io.rls_id = r.id AND io.is_deleted = 0 AND io.in_out_type = 0
         WHERE r.is_deleted = 0
+        AND r.stop_use = 0
         AND r.sh_id = #{shId}
         AND g.id = #{goodsId}
         <!-- 新增：可选库位过滤 -->
@@ -612,6 +613,7 @@
         LEFT JOIN ST_REALTIME_STOCK_LOCK l ON s.id = l.rls_id
         -- 调整：goods_code从关联的STGOODS表匹配，而非库存表
         WHERE g.goods_code = #{goodsCode}
+        AND s.stop_use = 0
         <if test="materialNo == null">
             AND s.material_no IS NULL
         </if>
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
index f5f65f4e1..3baf3c451 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
@@ -81,12 +81,6 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 		// 3. 先保存出库单基础记录（获取ID）
 		this.save(stOtherOutRecord);
 
-		if(stOtherOutRecord.getBfType() == 2 && rrId != null){
-			StReturnRecord stReturnRecord = stReturnRecordMapper.selectById(rrId);
-			stReturnRecord.setBfCode(String.valueOf(stOtherOutRecord.getId()));
-			stReturnRecordMapper.updateById(stReturnRecord);
-		}
-
 		MesApprovalRecordEntity approvalRecord = new MesApprovalRecordEntity();
 		approvalRecord.setBizId(stOtherOutRecord.getId());
 		approvalRecord.setBizType("报废审批");