update

sku3d/sku3d/api/a-excel.go

@@ -395,9 +395,7 @@ func ParseMatObject(ctx *repo.RepoSession, row []string, headers []string, cates
 			break
 		}
 	}
-	if MnemonicSignIndex == -1 {
-		return imageMat, fmt.Errorf("报关商品编码列未找到")
-	}
+
 	TaxNameCNIndex := -1
 	for i, header := range headers {
 		if header == "报关商品中文名" {
@@ -405,27 +403,28 @@ func ParseMatObject(ctx *repo.RepoSession, row []string, headers []string, cates
 			break
 		}
 	}
-	if TaxNameCNIndex == -1 {
-		return imageMat, fmt.Errorf("报关商品中文名列未找到")
+	if MnemonicSignIndex == -1 {
+		return imageMat, fmt.Errorf("报关商品编码列未找到")
 	}
-	imageMat.TaxNameCN = row[TaxNameCNIndex]
-
-	row15Cate := &model.Category{}
-	for _, cate := range cates {
-		if cate.Name == "报关助记符" {
-			for _, c := range cate.Children {
-				if c.Name == row[TaxNameCNIndex] {
-					row15Cate = c
-					break
+	if TaxNameCNIndex != -1 && len(row[TaxNameCNIndex]) > 0 {
+		imageMat.TaxNameCN = row[TaxNameCNIndex]
+		row15Cate := &model.Category{}
+		for _, cate := range cates {
+			if cate.Name == "报关助记符" {
+				for _, c := range cate.Children {
+					if c.Name == row[TaxNameCNIndex] {
+						row15Cate = c
+						break
+					}
 				}
+				break
 			}
-			break
 		}
+		if len(row15Cate.IdStr) <= 0 {
+			return imageMat, fmt.Errorf("%s的报关助记符未找到定义", row[TaxNameCNIndex])
+		}
+		imageMat.Categories = append(imageMat.Categories, row15Cate.IdStr)
 	}
-	if len(row15Cate.IdStr) <= 0 {
-		return imageMat, fmt.Errorf("%s的报关助记符未找到定义", row[TaxNameCNIndex])
-	}
-	imageMat.Categories = append(imageMat.Categories, row15Cate.IdStr)
 
 	//21.录入人名称
 	RecordUserIndex := -1
@@ -609,6 +608,7 @@ func ParseMatObject(ctx *repo.RepoSession, row []string, headers []string, cates
 	for i, header := range headers {
 		if header == "产品系列" {
 			ProductSeriesIndex = i
+			ProductSeriesCodeIndex = i
 			if i+1 < len(headers) && headers[i+1] == "产品系列" {
 				ProductSeriesIndex = i + 1
 			}