From b2e0aabbc20ee6bc84cfda7fd32050119ba599e9 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Mon, 23 Mar 2026 15:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E8=B4=A7=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E5=B0=81=E7=AE=B1=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E7=9A=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C=20NULL=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PackingServiceImpl.java           | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
index 24dff05..bc727e4 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
@@ -578,7 +578,7 @@ public class PackingServiceImpl implements PackingService {
             //查询打印的列信息
             List<Reportcontentitem> reportcontentitemList = reportcontentitemService.getReportcontentitemList(fileVo.getReportId());
             Map<String, String> itemMap = reportcontentitemList.stream().collect(Collectors.toMap(Reportcontentitem::getObjectgroup, Reportcontentitem::getDbfieldname));
-
+            String bartenderSeqKey = "";
             // 获取卷标签打印模板
             for (String key : itemMap.keySet()) {
                String dbName = itemMap.get(key);
@@ -594,9 +594,13 @@ public class PackingServiceImpl implements PackingService {
                         }
                     }
                 } else {
-                    // 手工参数 #子头
-                    if (dbName.indexOf("#") == 0) {
-                        itemMap.put(key, StringUtils.isNotEmpty(String.valueOf(paramMap.get(key))) ? String.valueOf(paramMap.get(key)) : " ");
+                    //流水号特殊测试
+                    if (dbName.startsWith("流水号")){
+                        bartenderSeqKey = key;
+                        log.info("流水号Key:{}",key);
+                    }else if (dbName.indexOf("#") == 0) {
+                        // 手工参数 #子头
+                        itemMap.put(key, paramMap.get(key) == null ? "" : String.valueOf(paramMap.get(key)));
                     }
                 }
             }
@@ -610,7 +614,7 @@ public class PackingServiceImpl implements PackingService {
             String seqNumber = reportfileSeqinfoService.getSeqNumber(fileVo.getReportId(), OutBoxConstant.SEQ_NUMBER, itemMap);
             //原佘莉写得方法
             if (StringUtils.isNotEmpty(seqNumber)) {
-                itemMap.put("流水号", seqNumber.toString());
+                itemMap.put(bartenderSeqKey, seqNumber.toString());
             }
             log.info("流水号处理完成");