From 07ca306fd5a41363a1f27562c3cb3915ce553827 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 9 May 2025 15:45:53 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E6=96=B0=E5=A2=9E=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hw/tagApi/service/utils/TagExcelUtil.java     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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 189769d..e9a4ee0 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
@@ -44,12 +44,17 @@ public class TagExcelUtil {
         Map<String, Object> result = new HashMap<>();
         try (Workbook workbook = WorkbookFactory.create(is)) {
             Sheet sheet = workbook.getSheetAt(0);
-
+            int startRow = 7;//正常模板表头第几数
             Row row = sheet.getRow(0);
             String exportTemplate = getCellStringValue(row.getCell(0));//导出再导入模板
             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 (exportTemplateFlag) {
                 result.put("tagList", new ArrayList<>());
@@ -65,12 +70,17 @@ public class TagExcelUtil {
                 result.put("tagList", tagList);
                 result.put("orderInfo", new HashMap<>());
                 result.put("templateType", ApiConstants.IMPORT_TEMPLATE_FOUR);
+            } else if (noHeadTemplateFlag) {
+                List<Map<String, String>> tagList = parseTagList(sheet, 1);
+                result.put("tagList", tagList);
+                result.put("orderInfo", new HashMap<>());
+                result.put("templateType", ApiConstants.IMPORT_TEMPLATE_FIVE);
             } else {
                 // 解析订单信息
                 Map<String, String> orderInfo = parseOrderInfo(sheet);
                 result.put("orderInfo", orderInfo);
                 // 解析标签数据
-                List<Map<String, String>> tagList = parseTagList(sheet, 7);
+                List<Map<String, String>> tagList = parseTagList(sheet, startRow);
                 result.put("tagList", tagList);
                 result.put("templateType", ApiConstants.IMPORT_TEMPLATE_THREE);
             }
@@ -469,6 +479,7 @@ public class TagExcelUtil {
         params.setLibraryFlag(String.valueOf(fields.getOrDefault("是否在库", "")));
         params.setIntendedUse(String.valueOf(fields.getOrDefault("计划用途", "")));
         params.setRemark(String.valueOf(fields.getOrDefault("备注", "")));
+        params.setTagBatch(String.valueOf(fields.getOrDefault("标签批次号", "")));
         return params;
     }