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

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

services/base/implments/Article.service.impl.go

@@ -253,7 +253,7 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}, taskVa
 		if utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)) == "" {
 			continue
 		}
-		if utils.ValueToString(v[3], "") == model.ART_TYPE_FINISHED {
+		if utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)) == model.ART_TYPE_FINISHED {
 			_stockLevel, _ := stockLevelDao.SelectOne(utils.ValueToString(v[3], ""))
 			if _stockLevel == nil {
 				stockLevelData = append(stockLevelData, modelAp.ArticleStockLevel{
@@ -351,6 +351,10 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}, taskVa
 				_info.Descr2 = utils.ValueToString(v[14], "")
 				isUp = true
 			}
+			if _info.ArtId != utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)) {
+				_info.ArtId = utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0))
+				isUp = true
+			}
 			if isUp {
 				_ = dao.UpdateOne(_info)
 			}
@@ -358,7 +362,7 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}, taskVa
 		}
 		data = append(data, model.Article{
 			PlantNr:     model.PlantNr,
-			ArtId:       utils.ValueToString(v[3], ""),
+			ArtId:       utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)),
 			Descr1:      utils.ValueToString(v[2], ""),
 			Descr2:      utils.ValueToString(v[14], ""),
 			ArtSpec1:    utils.ValueToString(v[9], ""),