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 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 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 rfc.ReportID AS reportId, rf.Reportfile AS reportFile, rfc.ParentReportID AS parentReportID,