From 0500a90687b7becbaffcc91e9fd67f9f53d02f68 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Sat, 6 Dec 2025 17:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=20?=
 =?UTF-8?q?=E5=AD=90=E6=A0=87=E7=AD=BE=20=E5=90=8E=E7=BC=80=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=A4=9A=E5=87=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PackingServiceImpl.java              | 11 ++++++++++-
 .../resources/mapper/finishedProduct/ReportFile.xml   |  3 +--
 2 files changed, 11 insertions(+), 3 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 5673281..1c82d19 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
@@ -423,6 +423,10 @@ public class PackingServiceImpl implements PackingService {
         List<ReportFileVo> sumReportFileVoList = new ArrayList<>();
         sumReportFileVoList = getReportFileList(reportFileVos, sumList);
         sumReportFileVoList.add(reportFileVo);
+        //添加子标签 2025-12-05 测试代码LR
+        log.info("新增测试打印子标签内容:{}", reportFileVos.toString());
+        sumReportFileVoList.addAll(reportFileVos);
+        log.info("新增测试打印全部标签内容:{}", sumReportFileVoList.toString());
         for (ReportFileVo fileVo : sumReportFileVoList) {
             // 数据 主键
             String serialNo = RandomUtil.getOrderNoByAtomic1("Box");
@@ -491,7 +495,12 @@ public class PackingServiceImpl implements PackingService {
             //打印参数
             Map<String, Object> printOutMap = new HashMap<>();
             printOutMap.put("printerName", userprinter.getNewprintername());
-            printOutMap.put("btwName", fileVo.getReportFile());
+            String bartenderName = fileVo.getReportFile();
+            //判断是否含有.btw 含有去掉后缀
+            if (fileVo.getReportFile().contains(".btw")) {
+                bartenderName = fileVo.getReportFile().substring(0, fileVo.getReportFile().toUpperCase().indexOf(".BTW"));
+            }
+            printOutMap.put("btwName", bartenderName);
             printOutMap.put("dataView", "box_label_print");
             printOutMap.put("dataViewColumn", "serial_no");
             printOutMap.put("dataViewCon", serialNo);
diff --git a/src/main/resources/mapper/finishedProduct/ReportFile.xml b/src/main/resources/mapper/finishedProduct/ReportFile.xml
index 0dfc9f7..9a42453 100644
--- a/src/main/resources/mapper/finishedProduct/ReportFile.xml
+++ b/src/main/resources/mapper/finishedProduct/ReportFile.xml
@@ -48,8 +48,7 @@
             rfc.SubReportFlag = 'Y' and  rfc.ParentReportID = #{reportId}
 
     </select>
-    <select id="getReportFileListDefaultByParnetNo"
-            resultType="com.gaotao.modules.finishedProduct.vo.ReportFileVo">
+    <select id="getReportFileListDefaultByParnetNo" resultType="com.gaotao.modules.finishedProduct.vo.ReportFileVo">
         SELECT rfc.ReportID  AS reportId,
                rf.Reportfile AS reportFile,
                rfc.ParentReportID AS parentReportID,