ods 修改 2021/3/24

models/ods/OdsHead.model.go

@@ -32,6 +32,7 @@ type OdsHead struct {
 	LastModify    grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ODS_OdsHead-LastModify"`
 	LastUser      string        `xorm:"nvarchar(20) 'LastUser' not null" json:"ODS_OdsHead-LastUser"`
 	CreateTime    grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ODS_OdsHead-CreateTime"`
+	Valst         []OdsStepLst  `json:"valst" xorm:"-"`
 }
 
 /******************************************************************************

services/ods/implments/ArtRouteOdsLst.service.impl.go

@@ -100,6 +100,10 @@ func (impl *ArtRouteOdsLstServiceImplement) InsertOne(user *models.Usertab, enti
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	// add Begin() before any action
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewArtRouteOdsLstDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(entity.ArtId, entity.OperationNr, entity.Pos)
 	if err != nil {
@@ -112,6 +116,13 @@ func (impl *ArtRouteOdsLstServiceImplement) InsertOne(user *models.Usertab, enti
 	if err != nil {
 		return err
 	}
+	lstdao := dal.NewArtRouteStepOdsLstDAO(session, user.Pid, user.Userid)
+	err = lstdao.Insert(&entity.Valst)
+	if err != nil {
+		return err
+	}
+	// add Commit() after all actions
+	session.Commit()
 	return nil
 }
 
@@ -127,6 +138,10 @@ func (impl *ArtRouteOdsLstServiceImplement) DeleteOne(user *models.Usertab, artI
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	// add Begin() before any action
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewArtRouteOdsLstDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(artId, operationNr, pos)
 	if err != nil {
@@ -144,6 +159,7 @@ func (impl *ArtRouteOdsLstServiceImplement) DeleteOne(user *models.Usertab, artI
 	if err != nil {
 		return err
 	}
+	session.Commit()
 	return nil
 }
 
@@ -187,6 +203,10 @@ func (impl *ArtRouteOdsLstServiceImplement) UpdateOne(user *models.Usertab, enti
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	// add Begin() before any action
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewArtRouteOdsLstDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(entity.ArtId, entity.OperationNr, entity.Pos)
 	if err != nil {
@@ -200,10 +220,15 @@ func (impl *ArtRouteOdsLstServiceImplement) UpdateOne(user *models.Usertab, enti
 		return err
 	}
 	lstdao := dal.NewArtRouteStepOdsLstDAO(session, user.Pid, user.Userid)
+	err = lstdao.DeleteMust(entity.ArtId)
+	if err != nil {
+		return err
+	}
 	err = lstdao.Update(&entity.Valst)
 	if err != nil {
 		return err
 	}
+	session.Commit()
 	return nil
 }
 

services/ods/implments/OdsHead.service.impl.go

@@ -96,6 +96,10 @@ func (impl *OdsHeadServiceImplement) InsertOne(user *models.Usertab, entity *mod
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	// add Begin() before any action
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewOdsHeadDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(entity.OdsId)
 	if err != nil {
@@ -108,6 +112,12 @@ func (impl *OdsHeadServiceImplement) InsertOne(user *models.Usertab, entity *mod
 	if err != nil {
 		return err
 	}
+	lstdao := dal.NewOdsStepLstDAO(session, user.Pid, user.Userid)
+	err = lstdao.Insert(&entity.Valst)
+	if err != nil {
+		return err
+	}
+	session.Commit()
 	return nil
 }
 
@@ -123,6 +133,10 @@ func (impl *OdsHeadServiceImplement) DeleteOne(user *models.Usertab, odsId strin
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	// add Begin() before any action
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewOdsHeadDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(odsId)
 	if err != nil {
@@ -135,6 +149,14 @@ func (impl *OdsHeadServiceImplement) DeleteOne(user *models.Usertab, odsId strin
 	if err != nil {
 		return err
 	}
+	lstdao := dal.NewOdsStepLstDAO(session, user.Pid, user.Userid)
+	err = lstdao.DeleteWhere([]grmi.Predicate{
+		meta.OdsStepLst_OdsId.NewPredicate(grmi.Equal, odsId),
+	})
+	if err != nil {
+		return err
+	}
+	session.Commit()
 	return nil
 }
 
@@ -155,6 +177,14 @@ func (impl *OdsHeadServiceImplement) SelectOne(user *models.Usertab, odsId strin
 	if err != nil {
 		return nil, err
 	}
+	lstdao := dal.NewOdsStepLstDAO(session, user.Pid, user.Userid)
+	list, err := lstdao.Select([]grmi.Predicate{
+		meta.OdsStepLst_OdsId.NewPredicate(grmi.Equal, odsId),
+	}, nil)
+	if err != nil {
+		return nil, err
+	}
+	result.Valst = list
 	return result, nil
 }
 
@@ -170,6 +200,10 @@ func (impl *OdsHeadServiceImplement) UpdateOne(user *models.Usertab, entity *mod
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	// add Begin() before any action
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewOdsHeadDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(entity.OdsId)
 	if err != nil {
@@ -182,6 +216,18 @@ func (impl *OdsHeadServiceImplement) UpdateOne(user *models.Usertab, entity *mod
 	if err != nil {
 		return err
 	}
+	lstdao := dal.NewOdsStepLstDAO(session, user.Pid, user.Userid)
+	err = lstdao.DeleteWhere([]grmi.Predicate{
+		meta.OdsStepLst_OdsId.NewPredicate(grmi.Equal, entity.OdsId),
+	})
+	if err != nil {
+		return err
+	}
+	err = lstdao.Update(&entity.Valst)
+	if err != nil {
+		return err
+	}
+	session.Commit()
 	return nil
 }