From 53b8c9825c97409e18d32e6eeec44dcf1aeeac15 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Wed, 29 Apr 2026 16:32:17 +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

---
 .../wms/service/IStOtherOutRecordService.java        |  2 +-
 .../wms/service/impl/StExpireRecordServiceImpl.java  |  2 +-
 .../service/impl/StOtherOutRecordServiceImpl.java    | 12 +++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java
index 8fe1086b..5d981b08 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java
@@ -45,7 +45,7 @@ public interface IStOtherOutRecordService extends BaseService<StOtherOutRecord>
 
 	void approvalRequest(Long id, Short approvalResult, BladeUser user);
 
-	void createPendingOutRecord(StOtherOutRecord record, List<StRealtimeStock> stockList, BladeUser user);
+	void createPendingOutRecord(StOtherOutRecord record, List<StRealtimeStock> stockList, BladeUser user, Long rrId);
 
 	StOtherOutRecordVO getDetail(Long id);
 }
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireRecordServiceImpl.java
index 41b6e4f4..7d072d16 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireRecordServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireRecordServiceImpl.java
@@ -138,7 +138,7 @@ public class StExpireRecordServiceImpl extends BaseServiceImpl<StExpireRecordMap
 			record.setBfType(bfType);
 			record.setRlsId(rlsId);
 			record.setOutQty(outQty);
-			stOtherOutRecordService.createPendingOutRecord(record, stockList, user);
+			stOtherOutRecordService.createPendingOutRecord(record, stockList, user, rrId);
 		}
 
 
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 45c81063..d5819154 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
@@ -14,8 +14,10 @@ import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.wms.excel.StOtherOutRecordExcel;
 import org.springblade.wms.mapper.StOtherOutRecordMapper;
+import org.springblade.wms.mapper.StReturnRecordMapper;
 import org.springblade.wms.pojo.entity.StOtherOutRecord;
 import org.springblade.wms.pojo.entity.StRealtimeStock;
+import org.springblade.wms.pojo.entity.StReturnRecord;
 import org.springblade.wms.pojo.entity.StStockInoutRecord;
 import org.springblade.wms.pojo.vo.StOtherOutRecordVO;
 import org.springblade.wms.service.IStOtherOutRecordService;
@@ -44,6 +46,8 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 	@Resource
 	IStRealtimeStockService stRealtimeStockService;
 	@Resource
+	StReturnRecordMapper stReturnRecordMapper;
+	@Resource
 	IMesApprovalRecordClient mesApprovalRecordClient;
 	@Resource
 	IUserClient userClient;
@@ -61,7 +65,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 	}
 
 	@Transactional(rollbackFor = Exception.class)
-	public void createPendingOutRecord(StOtherOutRecord stOtherOutRecord, List<StRealtimeStock> stockList, BladeUser user) {
+	public void createPendingOutRecord(StOtherOutRecord stOtherOutRecord, List<StRealtimeStock> stockList, BladeUser user, Long rrId) {
 		// 1. 设置默认审批状态：待审批
 
 		// 2. 补充审计字段
@@ -72,6 +76,12 @@ 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("报废审批");