diff --git a/services/base/implments/OPCComDetailRule.service.impl.go b/services/base/implments/OPCComDetailRule.service.impl.go index 6c9c1fa..1cd8089 100644 --- a/services/base/implments/OPCComDetailRule.service.impl.go +++ b/services/base/implments/OPCComDetailRule.service.impl.go @@ -98,7 +98,7 @@ func (impl *OPCComDetailRuleServiceImplement) InsertOne(user *models.Usertab, en session := engine.NewSession() defer session.Close() dao := dal.NewOPCComDetailRuleDAO(session, user.Pid, user.Userid) - ruleDao := dal.NewOPCComDetailRuleDAO(session, user.Pid, user.Userid) + ruleDao := dal.NewOPCComRuleDAO(session, user.Pid, user.Userid) record, err := dao.SelectOne(entity.PO, entity.StepNo, entity.RuleId, entity.DetailId) if err != nil { return err @@ -106,7 +106,7 @@ func (impl *OPCComDetailRuleServiceImplement) InsertOne(user *models.Usertab, en if record != nil { return grmi.NewBusinessError("已经存在相同主键的记录!") } - rule, err := ruleDao.SelectOne(entity.PO, entity.StepNo, entity.RuleId, entity.DetailId) + rule, err := ruleDao.SelectOne(entity.PO, entity.StepNo, entity.RuleId) if err != nil { return err } diff --git a/services/base/implments/OPCComRule.service.impl.go b/services/base/implments/OPCComRule.service.impl.go index 980bb4f..ac5ed83 100644 --- a/services/base/implments/OPCComRule.service.impl.go +++ b/services/base/implments/OPCComRule.service.impl.go @@ -113,7 +113,7 @@ func (impl *OPCComRuleServiceImplement) InsertOne(user *models.Usertab, entity * if basic == nil { return grmi.NewBusinessError("不存在对应的基础通信规则") } - if entity.StepType == basic.StepType { + if entity.StepType != basic.StepType { return grmi.NewBusinessError("和基础通信规则数据不一致") } err = dao.InsertOne(entity) diff --git a/services/base/implments/ProcessWorkPlaceLst.service.impl.go b/services/base/implments/ProcessWorkPlaceLst.service.impl.go index f6e663f..f81249e 100644 --- a/services/base/implments/ProcessWorkPlaceLst.service.impl.go +++ b/services/base/implments/ProcessWorkPlaceLst.service.impl.go @@ -213,7 +213,8 @@ func (impl *ProcessWorkPlaceLstServiceImplement) Insert(user *models.Usertab, en return grmi.NewBusinessError("不存在对应的工序数据") } li := entities.ProcessWorkPlaceLstLi - for _, entity := range li { + pos := 1 + for index, entity := range li { if entity.PO != po || entity.WorkLineId != workLineId { _ = session.Rollback() return grmi.NewBusinessError("关联工序不一致") @@ -227,6 +228,9 @@ func (impl *ProcessWorkPlaceLstServiceImplement) Insert(user *models.Usertab, en _ = session.Rollback() return grmi.NewBusinessError("不存在对应的工位,workPlaceNr:" + strconv.Itoa(entity.WorkPlaceNr)) } + entity.Pos = pos + pos++ + li[index] = entity } err = dao.DeleteWhere([]grmi.Predicate{meta.ProcessWorkPlaceLst_PO.NewPredicate(grmi.Equal, po), meta.ProcessWorkPlaceLst_WorkLineId.NewPredicate(grmi.Equal, workLineId)}) if err != nil {