From 43847fd4d4cdafe35152a67c20165dbba14b88f7 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Fri, 8 May 2026 17:35:28 +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/impl/StExpireRecordServiceImpl.java   | 11 ++++++-----
 .../wms/service/impl/StGlassCakeOutServiceImpl.java   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

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 7d072d16..3a7070c2 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
@@ -107,7 +107,6 @@ public class StExpireRecordServiceImpl extends BaseServiceImpl<StExpireRecordMap
 		} else {
 			stock.setOutQuantity(stock.getQuantity());
 		}
-		stock.setIsScrap(1L);
 		stRealtimeStockService.updateById(stock);
 
 		List<StRealtimeStock> stockList = Collections.singletonList(stock);
@@ -119,15 +118,17 @@ public class StExpireRecordServiceImpl extends BaseServiceImpl<StExpireRecordMap
 		record.setBfCode(bfCode);
 
 		if (bfType == 1) {
+			stock.setIsScrap(1L);
+			stRealtimeStockService.updateById(stock);
 			// 到期维护报废：无需审批，直接设为「已审批」状态
-			record.setApprovalStatus(StOtherOutRecord.APPROVAL_STATUS_CHECKED); // 审批字段在该表
-			record.setApprovalTime(new Date()); // 可选：补充审批时间（已审批则赋值当前时间）
-			record.setApprover(user.getUserId()); // 可选：补充审批人（当前用户）
+			record.setApprovalStatus(StOtherOutRecord.APPROVAL_STATUS_CHECKED);
+			record.setApprovalTime(new Date());
+			record.setApprover(user.getUserId());
 			record.setBfType(bfType);
 			stOtherOutRecordService.addOtherOutRecord(record, stockList, user);
 		} else {
 			// 玻璃饼/归还报废：需要审批，设为「待审批」状态
-			record.setApprovalStatus(StOtherOutRecord.APPROVAL_STATUS_CHECKING); // 审批字段在该表
+			record.setApprovalStatus(StOtherOutRecord.APPROVAL_STATUS_CHECKING);
 			// 待审批状态：审批时间/审批人暂为空，审批通过后再赋值
 			if(bfType == 2){
 				StReturnRecord stReturnRecord = stReturnRecordMapper.selectById(rrId);
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
index 8dcd8fd4..92baeb72 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
@@ -123,7 +123,7 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 				// 步骤3：筛选出IS_CLASS_CAKE为"玻璃饼"的记录（核心过滤）
 				if (!CollectionUtils.isEmpty(allChildPartList)) {
 					glassCakePartList = allChildPartList.stream()
-						.filter(part -> Boolean.TRUE.equals(part.getIsGlassCake()))
+						.filter(part -> "1".equals(part.getIsGlassCake()))
 						.collect(Collectors.toList());
 				}
 			}