Merge pull request '金蝶更新' (#281) from feature_jindie into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/281

services/ap/implments/CustDemandVerHead.service.impl.go

@@ -1554,28 +1554,28 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 			_article, _ := articleDao.SelectOne(ArtId)
 			if _article == nil {
 				errInfo := new(model.ErrorDatalst)
-				errInfo.ErrorInfo = "物料不存在"
+				errInfo.ErrorInfo = "物料不存在 物料编号:" + ArtId
 				errInfo.ErrorType = "NoArticle"
 				errInfo.ErrorStatus = "error"
 				errInfo.TargetSource = savePath
 				_ = errDao.InsertOne(errInfo)
 				articleMap[ArtId] = 1
-				continue
-			}
-			if _article.ArtSize1 == "1" {
-				//查询bom
-				_bom, _ := bomDao.SelectOne(ArtId)
-				if _bom == nil {
-					errInfo := new(model.ErrorDatalst)
-					errInfo.ErrorInfo = "bom未配置"
-					errInfo.ErrorType = "NoBom"
-					errInfo.ErrorStatus = "error"
-					errInfo.TargetSource = savePath
-					_ = errDao.InsertOne(errInfo)
-					articleMap[ArtId] = 1
-					continue
+			} else {
+				if _article.ArtSize1 != "1" {
+					//查询bom
+					_bom, _ := bomDao.SelectOne(ArtId)
+					if _bom == nil {
+						errInfo := new(model.ErrorDatalst)
+						errInfo.ErrorInfo = "bom未配置 物料编号:" + ArtId
+						errInfo.ErrorType = "NoBom"
+						errInfo.ErrorStatus = "error"
+						errInfo.TargetSource = savePath
+						_ = errDao.InsertOne(errInfo)
+						articleMap[ArtId] = 1
+					}
 				}
 			}
+
 			articleMap[ArtId] = 2
 		}
 		//判断客户是否存在