From 8dbbdac1e1f2270c6e56c5465b617316e4496a88 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Tue, 26 May 2026 20:37:26 +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/StGlassCakeOutServiceImpl.java    | 10 ++++++++++
 .../wms/service/impl/StGraphiteMoldOutServiceImpl.java |  6 ++++++
 2 files changed, 16 insertions(+)

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 0431d8023..9ae8d8d56 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
@@ -204,6 +204,11 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 				List<StRealtimeStock> allUsableStockList = stRealtimeStockMapper.selectMaxUsableStockByCakeAttr(
 					isPrint, powderWeight, materialNo, thickness, goodsCode);
 
+				if (allUsableStockList == null || allUsableStockList.isEmpty()) {
+					System.out.println("玻璃饼[编码：" + goodsCode + "]库存不足，跳过生成！");
+					// 跳过当前这条，继续下一条玻璃饼
+					continue;
+				}
 				for (StRealtimeStock stock : allUsableStockList) {
 					double occupy = Optional.ofNullable(stock.getOccupyQuantity()).orElse(0D);
 					double usableQty = stock.getQuantity() - occupy;
@@ -226,6 +231,11 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 					continue;
 				}
 
+				if (candidateStockList.isEmpty()) {
+					System.out.println("玻璃饼[编码：" + goodsCode + "]库存不足，跳过生成！");
+					// 跳过当前这条，继续下一条玻璃饼
+					continue;
+				}
 				// ===================== 走到这里 = 库存足够，开始真正生成预出库 =====================
 				double remainingQty = requireQty;
 				for (StRealtimeStock maxStock : candidateStockList) {
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java
index a50855f7b..de9f666bb 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java
@@ -74,6 +74,9 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 		double totalUsable = 0.0;
 		List<StRealtimeStock> allUsableStockList = stRealtimeStockMapper.selectMaxUsableStockByMoldAttr(goodsCode);
 
+		if (allUsableStockList == null || allUsableStockList.isEmpty()) {
+			throw new ServiceException("石墨模【" + goodsCode + "】库存不足，无法生成！需求数量：" + requireQty);
+		}
 		for (StRealtimeStock stock : allUsableStockList) {
 			double occupy = Optional.ofNullable(stock.getOccupyQuantity()).orElse(0D);
 			double usableQty = stock.getQuantity() - occupy;
@@ -92,6 +95,9 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 //		if (totalUsable < requireQty - 0.001) {
 //			throw new ServiceException("石墨模【" + goodsCode + "】库存不足，无法生成！需求数量：" + requireQty + "，可用库存：" + totalUsable);
 //		}
+		if (candidateStockList.isEmpty()) {
+			throw new ServiceException("石墨模【" + goodsCode + "】库存不足，无法生成！需求数量：" + requireQty);
+		}
 
 		double remainingQty = requireQty;
 		for (StRealtimeStock maxStock : candidateStockList) {