From e34ff4bccf07bb74ce8a14c0b8dd107dc7726420 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 23 Sep 2021 17:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=97=B6=E7=9A=84=E6=95=B0=E6=8D=AE=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/implments/Article.service.impl.go | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/services/base/implments/Article.service.impl.go b/services/base/implments/Article.service.impl.go index 87fbe08..f787653 100644 --- a/services/base/implments/Article.service.impl.go +++ b/services/base/implments/Article.service.impl.go @@ -4,12 +4,14 @@ package implments import ( dal "LAPP_ACURA_MOM_BACKEND/dao/base" + meDal "LAPP_ACURA_MOM_BACKEND/dao/me" "LAPP_ACURA_MOM_BACKEND/db" + "LAPP_ACURA_MOM_BACKEND/global" "LAPP_ACURA_MOM_BACKEND/grmi" meta "LAPP_ACURA_MOM_BACKEND/meta/base" + meMeta "LAPP_ACURA_MOM_BACKEND/meta/me" model "LAPP_ACURA_MOM_BACKEND/models/base" "LAPP_ACURA_MOM_BACKEND/utils" - "LAPP_ACURA_MOM_BACKEND/global" ) /****************************************************************************** @@ -186,7 +188,11 @@ func (impl *ArticleServiceImplement) DeleteOne(user *global.User, artId string) if err := session.Begin(); err != nil { return err } + checkDao := dal.NewArtCheckRuleDAO(session, user.PlantNr, user.UserId) + qtyDao := dal.NewArtQtyAllocateDAO(session, user.PlantNr, user.UserId) dao := dal.NewArticleDAO(session, user.PlantNr, user.UserId) + bomHeadDao := meDal.NewBomHeadDAO(session, user.PlantNr, user.UserId) + bomLstDao := meDal.NewBomLstDAO(session, user.PlantNr, user.UserId) record, err := dao.SelectOne(artId) if err != nil { return err @@ -196,7 +202,7 @@ func (impl *ArticleServiceImplement) DeleteOne(user *global.User, artId string) } err = dao.DeleteOne(artId) if err != nil { - session.Rollback() + _ = session.Rollback() return err } lstdao := dal.NewArticleAtcodLstDAO(session, user.PlantNr, user.UserId) @@ -204,10 +210,30 @@ func (impl *ArticleServiceImplement) DeleteOne(user *global.User, artId string) meta.ArticleAtcodLst_ArtId.NewPredicate(grmi.Equal, artId), }) if err != nil { - session.Rollback() + _ = session.Rollback() return err } - session.Commit() + err = checkDao.DeleteWhere([]grmi.Predicate{meta.ArtCheckRule_ArtId.NewPredicate(grmi.Equal, artId)}) + if err != nil { + _ = session.Rollback() + return err + } + err = qtyDao.DeleteWhere([]grmi.Predicate{meta.ArtQtyAllocate_ArtId.NewPredicate(grmi.Equal, artId)}) + if err != nil { + _ = session.Rollback() + return err + } + err = bomHeadDao.DeleteWhere([]grmi.Predicate{meMeta.BomHead_BomId.NewPredicate(grmi.Equal, artId)}) + if err != nil { + _ = session.Rollback() + return err + } + err = bomLstDao.DeleteWhere([]grmi.Predicate{meMeta.BomLst_BomId.NewPredicate(grmi.Equal, artId)}) + if err != nil { + _ = session.Rollback() + return err + } + _ = session.Commit() return nil }