From 34b27eabd2528c70baa5002834a6fd70c250d7e5 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Mon, 7 Sep 2026 14:18:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=20=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A1=8C=E7=BA=A7=E5=BF=85=E5=A1=AB=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C+=E9=A1=B5=E7=AD=BE=E8=A7=A3=E6=9E=90=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E5=AE=8C=E6=95=B4=E5=A0=86=E6=A0=88=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

一、行级必填校验（ReservationStockInOrderImpl）
- 入库导入：新增校验空【產品編號】/空【支/件数】的明细行，给出明确提示
- 出库导入：新增校验空【支/件数】的明细行
- 修复原因：明细行件数为空时 new BigDecimal(null) 抛无信息的 NullPointerException，页面只显示 页签[x]：java.lang.NullPointerException 无法定位

二、页签解析失败完整堆栈日志
- 出/入库多页签解析第一阶段捕获异常时，将完整堆栈打入服务端日志（LOGGER.error），便于远程定位页签内具体报错行号
---
 .../ReservationStockInOrderImpl.java           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
index 6a2bc7e5a..837b754b5 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
@@ -336,6 +336,12 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         if (productDetailList.isEmpty()) {
             throw new Exception("未解析到产品明细数据，请检查模板中是否填写了產品編號");
         }
+        // 行级必填校验：支数缺失的行直接给出明确提示，避免后续 new BigDecimal(null) 抛无信息的NPE
+        for (ProductDetail productDetail : productDetailList) {
+            if (productDetail.getPieceCount() == null) {
+                throw new Exception("产品[" + productDetail.getProductCode() + "]的【支/件数】未填写，请补全后重新导入");
+            }
+        }
 
         LOGGER.info("页签[{}]解析完成，货品明细{}条，客户配送明细{}条",
                 sheetName, productDetailList.size(), customerDeliveryDetailList.size());
@@ -658,6 +664,9 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
                     preparedOrders.add(prepared); // null=空页签，跳过
                 }
             } catch (Exception e) {
+                // 完整堆栈进服务端日志，便于定位页签内解析异常的具体行号
+                LOGGER.error("页签[{}]入库导入解析失败", name, e);
+                // 非模板页签的解析异常（如NPE）message 可能为空，兜底用异常类名，避免报错显示"页签[x]：null"
                 sheetProblems.add("页签[" + name + "]：" + (e.getMessage() == null ? e.toString() : e.getMessage()));
             }
         }
@@ -710,6 +719,15 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         if (productDetailList == null || productDetailList.isEmpty()) {
             return null;
         }
+        // 行级必填校验：编号/支数缺失的行直接给出明确提示，避免后续 new BigDecimal(null) 抛无信息的NPE
+        for (StockInProductDetail productDetail : productDetailList) {
+            if (productDetail.getProductCode() == null || productDetail.getProductCode().trim().isEmpty()) {
+                throw new ServiceException("存在未填写【產品編號】的明细行，请补全后重新导入");
+            }
+            if (productDetail.getPieceCount() == null) {
+                throw new ServiceException("产品[" + productDetail.getProductCode() + "]的【支/件数】未填写，请补全后重新导入");
+            }
+        }
         StockInHeader stockInHeader = resultDTO.getStockInHeader();
         // ====== 第一步：物料编号存在性校验（模板只填物料编号即可，名称按编号自动匹配） ======
         // 查询结果为空说明库中没有该物料，先收集全部缺失编号，不立即报错