From b0f8f2cd5a682c72ac12f2af788ba5abc0fde2ec Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Sat, 16 May 2026 10:15:46 +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/mapper/StRealtimeStockMapper.xml | 53 +++++++++++++++++--
1 file changed, 48 insertions(+), 5 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 52499884f..5dc27c1ed 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
@@ -609,11 +609,34 @@
-- 原有：左连接锁料表，保留工单关联（必须加，否则查错锁料量）
LEFT JOIN ST_REALTIME_STOCK_LOCK l ON s.id = l.rls_id
-- 调整：goods_code从关联的STGOODS表匹配，而非库存表
- WHERE s.print_mark = #{isPrint}
- AND s.powder_weight = #{powderWeight}
- AND s.material_no = #{materialNo}
- AND s.thickness = #{thickness}
- AND g.goods_code = #{goodsCode}
+ WHERE g.goods_code = #{goodsCode}
+
+ AND s.material_no IS NULL
+
+
+ AND s.material_no = #{materialNo}
+
+
+
+ AND s.powder_weight IS NULL
+
+
+ AND s.powder_weight = #{powderWeight}
+
+
+
+ AND s.thickness IS NULL
+
+
+ AND s.thickness = #{thickness}
+
+
+
+ AND s.print_mark IS NULL
+
+
+ AND s.print_mark = #{isPrint}
+
-- 原有：按可用量（库存数量-已占用数量）倒序，空占用按0计算
ORDER BY (s.quantity - NVL(l.occupy_quantity, 0)) DESC
) t
@@ -648,5 +671,25 @@
AND s.is_deleted = 0
AND g.is_deleted = 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+