From 3576d734afa631d225bc00f7adac290b6c81b8d5 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Wed, 2 Sep 2026 15:43:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=20=E5=87=BA=E5=BA=93=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E5=AF=BC=E5=85=A5=E5=8F=91=E7=A5=A8=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E8=90=BD=E5=BA=93=EF=BC=8C=E8=A1=A5=E9=BD=90?=
 =?UTF-8?q?=E7=B9=81=E7=AE=80=E5=BD=92=E4=B8=80=E5=8C=96=E3=80=8C=E7=99=BC?=
 =?UTF-8?q?/=E9=A1=8D=E3=80=8D=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

模板列头「發票編號/金額/發票張數」归一化时映射表缺「發→发」「額→额」，發票編號列识别失败(invoiceNoCol=-1)，客户配送明细落库时发票编号为空、查看不回显，金额列与发票张数同样受影响。补齐映射并在关键列缺失时输出告警日志；历史已导入单据需重新导入。
---
 .../listener/DynamicDeliveryExcelListener.java         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/DynamicDeliveryExcelListener.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/DynamicDeliveryExcelListener.java
index 07ae79d33..60edcf4f1 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/DynamicDeliveryExcelListener.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/DynamicDeliveryExcelListener.java
@@ -365,6 +365,12 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener<Map<Stri
         customerPackageCol = packageColTmp;
         customerAmountCol = amountColTmp;
         customerColumnsResolved = true;
+        // 关键列未识别到时告警，避免发票编号等字段静默丢失
+        if (invoiceNoColTmp < 0 || amountColTmp < 0) {
+            LOGGER.warn("第{}行客户配送明细列头识别到但存在缺失列：发票编号列={}，金额列={}，" +
+                    "对应数据将解析为空，请检查模板列头文字是否在归一化映射范围内",
+                    currentRowNum, invoiceNoColTmp, amountColTmp);
+        }
         LOGGER.info("第{}行识别为客户配送明细列头行，列映射：类别={}，发票编号={}，客户编号={}，名称={}，箱={}，包={}，金额={}",
                 currentRowNum, categoryCol, invoiceNoCol, customerCodeCol, customerNameCol, customerBoxCol, customerPackageCol, customerAmountCol);
         return true;
@@ -544,7 +550,9 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener<Map<Stri
                 .replace('數', '数').replace('飲', '饮').replace('規', '规').replace('戶', '户')
                 .replace('紀', '纪').replace('錄', '录').replace('張', '张').replace('計', '计')
                 .replace('車', '车').replace('線', '线').replace('類', '类').replace('別', '别')
-                .replace('簡', '简').replace('產', '产').replace('單', '单');
+                .replace('簡', '简').replace('產', '产').replace('單', '单')
+                // 維他奶模板「發票編號/發票張數/金額」用字：缺了这两项会导致發票編號列识别失败、发票编号不落库
+                .replace('發', '发').replace('額', '额');
         return s;
     }