diff --git a/tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java b/tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java index 4dd3456..9f3edf7 100644 --- a/tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java +++ b/tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java @@ -332,6 +332,7 @@ public class HwTagRecordServiceImpl implements IHwTagRecordService { orderInfo.put("orderNo", orderCode); orderInfo.put("batchNo", batchNumber); List> tagList = (List>) excelResult.get("tagList"); + orderInfo.put("totalCount", String.valueOf(tagList.size())); // 转换Excel数据为HwTagRecord列表 tagRecordList = convertExcelDataToTagRecords(orderInfo, tagList, params); } diff --git a/tagApi-service/src/main/java/hw/tagApi/service/utils/TagExcelUtil.java b/tagApi-service/src/main/java/hw/tagApi/service/utils/TagExcelUtil.java index e9a4ee0..714d9d5 100644 --- a/tagApi-service/src/main/java/hw/tagApi/service/utils/TagExcelUtil.java +++ b/tagApi-service/src/main/java/hw/tagApi/service/utils/TagExcelUtil.java @@ -50,11 +50,13 @@ public class TagExcelUtil { boolean exportTemplateFlag = StringUtils.hasText(exportTemplate) && exportTemplate.equals("RID"); boolean isInventoryFlag = validateCells(row.getCell(8), row.getCell(9));//桌面读写器盘点模板 boolean codeWriterFlag = validateCells(row.getCell(2), row.getCell(5));//写码机写读盘点模板 - String reduceOneTemplate = getCellStringValue(sheet.getRow(5).getCell(0));//少一个空行模板 - boolean noHeadTemplateFlag = StringUtils.hasText(exportTemplate) && exportTemplate.equals("序号");//无头模板 - if (StringUtils.hasText(reduceOneTemplate) && reduceOneTemplate.equals("序号")) { - startRow = 6; + if (sheet.getRow(5) != null) { //少一个空行模板 + String reduceOneTemplate = getCellStringValue(sheet.getRow(5).getCell(0)); + if (StringUtils.hasText(reduceOneTemplate) && reduceOneTemplate.equals("序号")) { + startRow = 6; + } } + boolean noHeadTemplateFlag = StringUtils.hasText(exportTemplate) && exportTemplate.equals("序号");//无头模板 if (exportTemplateFlag) { result.put("tagList", new ArrayList<>());