update 添加写码机写读盘点模板

tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java

@@ -294,7 +294,8 @@ public class HwTagRecordServiceImpl implements IHwTagRecordService {
                     convertExcelDataTemplateOne(tagRecordList, params);
                 }
 
-                if (templateType.equals(ApiConstants.IMPORT_TEMPLATE_TWO) || templateType.equals(ApiConstants.IMPORT_TEMPLATE_THREE)) {
+                if (templateType.equals(ApiConstants.IMPORT_TEMPLATE_TWO) || templateType.equals(ApiConstants.IMPORT_TEMPLATE_THREE)
+                        || templateType.equals(ApiConstants.IMPORT_TEMPLATE_FOUR)) {
                     // 获取订单信息和标签数据
                     Map<String, String> orderInfo = (Map<String, String>) excelResult.get("orderInfo");
                     List<Map<String, String>> tagList = (List<Map<String, String>>) excelResult.get("tagList");

tagApi-service/src/main/java/hw/tagApi/service/utils/TagExcelUtil.java

@@ -42,6 +42,7 @@ public class TagExcelUtil {
             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));//写码机写读盘点模板
 
             if (exportTemplateFlag) {
                 result.put("tagList", new ArrayList<>());
@@ -52,6 +53,11 @@ public class TagExcelUtil {
                 result.put("tagList", tagList);
                 result.put("orderInfo", new HashMap<>());
                 result.put("templateType", ApiConstants.IMPORT_TEMPLATE_TWO);
+            } else if (codeWriterFlag) {
+                List<Map<String, String>> tagList = parseTagList(sheet, 1);
+                result.put("tagList", tagList);
+                result.put("orderInfo", new HashMap<>());
+                result.put("templateType", ApiConstants.IMPORT_TEMPLATE_FOUR);
             } else {
                 // 解析订单信息
                 Map<String, String> orderInfo = parseOrderInfo(sheet);
@@ -72,14 +78,14 @@ public class TagExcelUtil {
     /**
      * 校验单元格值是否符合要求
      *
-     * @param cellI1 I1单元格
-     * @param cellJ1 J1单元格
+     * @param epcCell epc
+     * @param tidCell tid
      * @return 校验结果
      */
-    private static boolean validateCells(Cell cellI1, Cell cellJ1) {
+    private static boolean validateCells(Cell epcCell, Cell tidCell) {
         // 获取单元格值并转换为字符串
-        String valueI1 = getCellStringValue(cellI1);
-        String valueJ1 = getCellStringValue(cellJ1);
+        String valueI1 = getCellStringValue(epcCell);
+        String valueJ1 = getCellStringValue(tidCell);
 
         // 校验是否满足条件
         return "EPC".equalsIgnoreCase(valueI1) && "TID".equalsIgnoreCase(valueJ1);