diff --git a/bms-back/bms-admin/src/main/resources/i18n/messages.properties b/bms-back/bms-admin/src/main/resources/i18n/messages.properties index 52b715b5..2769eb8e 100644 --- a/bms-back/bms-admin/src/main/resources/i18n/messages.properties +++ b/bms-back/bms-admin/src/main/resources/i18n/messages.properties @@ -120,6 +120,8 @@ price.product.import.fileEmpty=上传文件不能为空 price.product.import.fileType=仅支持 xls / xlsx 文件 price.product.import.sheetNotFound=未找到「产品目录」sheet,请上传威狮B2C小包价表格格式文件 price.product.import.noData=产品目录无有效数据行 +price.product.import.catalogHeaderMissing=「产品目录」未找到表头「对接代码」,请在标题行下补齐表头(对接代码、产品名称、时效、走货属性、国家等) +price.product.import.countryCatalogHeaderMissing=「产品目录」未找到表头「产品名称」或「产品ID」,请确认是否为单国专线成本价表格式 price.product.import.regionEmpty=region 无可用国家数据,请先同步/维护国家表后再导入 price.product.import.partialFail=导入完成但存在失败项:新增 {0},跳过 {1};失败明细:{2} price.product.import.effTooEarly=产品{0}({1})导入生效时间{2}早于该产品上一版生效时间{3},不允许导入 diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java index 3cea2e69..a9dadbfd 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java @@ -1671,7 +1671,7 @@ public class BmsProductServiceImpl implements IBmsProductService int[] header = findHeaderCell(sheet, "\u5bf9\u63a5\u4ee3\u7801"); if (header == null) { - return list; + throw new ServiceException(MessageUtils.message("price.product.import.catalogHeaderMissing")); } int headerRowIdx = header[0]; int colCode = header[1]; @@ -2455,7 +2455,7 @@ public class BmsProductServiceImpl implements IBmsProductService } if (header == null) { - return list; + throw new ServiceException(MessageUtils.message("price.product.import.countryCatalogHeaderMissing")); } Row head = sheet.getRow(header[0]); int colCode = firstCol(head, "\u4ea7\u54c1ID", "\u4ea7\u54c1\u5bf9\u63a5\u4ee3\u7801", "\u4ea7\u54c1\u4ee3\u7801"); diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsRedlineProductServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsRedlineProductServiceImpl.java index 7e83a687..f54e8d92 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsRedlineProductServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsRedlineProductServiceImpl.java @@ -1502,7 +1502,7 @@ public class BmsRedlineProductServiceImpl implements IBmsRedlineProductService int[] header = findHeaderCell(sheet, "\u5bf9\u63a5\u4ee3\u7801"); if (header == null) { - return list; + throw new ServiceException(MessageUtils.message("price.product.import.catalogHeaderMissing")); } int headerRowIdx = header[0]; int colCode = header[1]; @@ -2265,7 +2265,7 @@ public class BmsRedlineProductServiceImpl implements IBmsRedlineProductService } if (header == null) { - return list; + throw new ServiceException(MessageUtils.message("price.product.import.countryCatalogHeaderMissing")); } Row head = sheet.getRow(header[0]); int colCode = firstCol(head, "\u4ea7\u54c1ID", "\u4ea7\u54c1\u5bf9\u63a5\u4ee3\u7801", "\u4ea7\u54c1\u4ee3\u7801");