From 7d3a16ce5441228366f2387666437b95473d6324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com>
Date: Thu, 14 May 2026 19:23:55 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#452:=20=E9=A2=86=E7=94=A8=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E6=A8=A1=E5=9D=97=E9=80=89=E6=8B=A9=E8=8D=AF=E5=93=81?=
 =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA"=E4=BB=93=E5=BA=93=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B8=BA0=EF=BC=8C=E6=97=A0=E6=B3=95=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8"=EF=BC=8C=E4=B8=8E=E5=AE=9E=E9=99=85=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E4=B8=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

严格批号查询返回记录但 orgQuantity=0 时，原代码直接调用 applyFromDto 并弹出警告，
未回退到非严格查询（不含 lotNumber）获取同仓库其他有库存的批号。
修复：在 applyFromDto 之前检查 orgQuantity > 0，数量为0时回退到非严格查询。
---
 .../requisitionManagement/index.vue                  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
index f9bacdf61..0076706a3 100755
--- a/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
@@ -1131,15 +1131,15 @@ function handleLocationClick(item, row, index) {
     .then((res) => {
       const list = res.data || [];
       const d = pickBestOrgQuantityRow(list);
-      const strictOk = d && Number(d.orgQuantity ?? 0) > 0;
-      if (strictOk) {
+
+      // 严格批号查询有库存（orgQuantity > 0）
+      if (d && Number(d.orgQuantity ?? 0) > 0) {
         applyFromDto(d, false);
-        if (Number(r.totalQuantity) <= 0) {
-          proxy.$message.warning('仓库数量为0，无法调用！');
-        }
         persistStore();
         return;
       }
+
+      // 严格查询无库存或数量为0 → 回退到非严格查询（查同仓库其他批号）
       if (lotTrimmed) {
         return runGet(false).then((res2) => {
           const list2 = res2.data || [];
@@ -1157,6 +1157,8 @@ function handleLocationClick(item, row, index) {
           persistStore();
         });
       }
+
+      // 没有指定批号，直接提示
       r.totalQuantity = 0;
       r.price = 0;
       proxy.$message.warning('仓库数量为0，无法调用！');