From a40c48ee066f1ad79cdb1750f6e06c9b4ea4bfcb Mon Sep 17 00:00:00 2001 From: yehongyang Date: Fri, 24 Dec 2021 21:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9D=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/base/implments/Article.service.impl.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/base/implments/Article.service.impl.go b/services/base/implments/Article.service.impl.go index 92d7126..fa46ebe 100644 --- a/services/base/implments/Article.service.impl.go +++ b/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], ""),