Browse Source

添加通过工艺添加开放协议的方法

pull/84/head
zhangxin 3 years ago
parent
commit
c2b48579bf
4 changed files with 131 additions and 1 deletions
  1. +19
    -0
      services/base/TightenWrenchInfo.service.go
  2. +85
    -1
      services/base/implments/TightenWrenchInfo.service.impl.go
  3. +23
    -0
      web/controllers/base/TightenWrenchInfo.rest.go
  4. +4
    -0
      web/controllers/base/base.go

+ 19
- 0
services/base/TightenWrenchInfo.service.go View File

@ -177,6 +177,25 @@ type TightenWrenchInfoService interface {
*
******************************************************************************/
Update(*models.Usertab, *[]model.TightenWrenchInfo) error
/******************************************************************************
*
* @Function Name : Save
*-----------------------------------------------------------------------------
*
* @Description : 保存TightenWrenchInfo
*
* @Function Parameters : 当前访问人员信息
*
* @Function Parameters : 需要修改的TightenWrenchInfo
*
* @Return Value : 执行时发生的错误
*
* @Author : zhangxin
*
* @Date : 2021-08-18
*
******************************************************************************/
Save(*models.Usertab, *model.TightenWrenchInfo) error
}
/******************************************************************************


+ 85
- 1
services/base/implments/TightenWrenchInfo.service.impl.go View File

@ -131,7 +131,7 @@ func (impl *TightenWrenchInfoServiceImplement) InsertOne(user *models.Usertab, e
_ = session.Rollback()
return grmi.NewBusinessError("不存在对应的工位")
}
if operation.PO != entity.PO || operation.StepNo != entity.StepNo || operation.StepDesc != entity.StepDesc || operation.ProjectId != entity.ProjectId{
if operation.PO != entity.PO || operation.StepNo != entity.StepNo || operation.StepDesc != entity.StepDesc || operation.ProjectId != entity.ProjectId {
_ = session.Rollback()
return grmi.NewBusinessError("工艺数据错误")
}
@ -438,3 +438,87 @@ func (impl *TightenWrenchInfoServiceImplement) Update(user *models.Usertab, enti
}
return nil
}
/******************************************************************************
*
* @Reference LAPP_LF_MOM_BACKEND/services/base/TightenWrenchInfoService.Save
*
******************************************************************************/
func (impl *TightenWrenchInfoServiceImplement) Save(user *models.Usertab, entity *model.TightenWrenchInfo) error {
grmi.Log(user, "/services/base/implments/TightenWrenchInfo.service.impl.go", "UpdateOneTightenWrenchInfo", "修改一个TightenWrenchInfo")
engine := db.Eloquent.Master()
session := engine.NewSession()
defer session.Close()
if err := session.Begin(); err != nil {
return err
}
dao := dal.NewTightenWrenchInfoDAO(session, user.Pid, user.Userid)
ruleDao := dal.NewTightenWrenchRuleInfoDAO(session, user.Pid, user.Userid)
opDao := dal.NewOperationDAO(session, user.Pid, user.Userid)
workPlaceDao := dal.NewWorkPlaceDAO(session, user.Pid, user.Userid)
workPlace, err := workPlaceDao.SelectOne(entity.WorkPlaceNr)
if err != nil {
_ = session.Rollback()
return err
}
if workPlace == nil {
_ = session.Rollback()
return grmi.NewBusinessError("不存在对应的工位")
}
operation, err := opDao.SelectOne(entity.OperationId)
if err != nil {
_ = session.Rollback()
return err
}
if operation == nil {
_ = session.Rollback()
return grmi.NewBusinessError("不存在对应的工艺")
}
if operation.PO != entity.PO || operation.StepNo != entity.StepNo || operation.StepDesc != entity.StepDesc || operation.ProjectId != entity.ProjectId {
_ = session.Rollback()
return grmi.NewBusinessError("工艺数据错误")
}
err = dao.DeleteWhere([]grmi.Predicate{meta.TightenWrenchInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)})
if err != nil {
_ = session.Rollback()
return err
}
err = ruleDao.DeleteWhere([]grmi.Predicate{meta.TightenWrenchRuleInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)})
if err != nil {
_ = session.Rollback()
return err
}
ruleLi := entity.TightenWrenchRuleInfoLi
if len(ruleLi) == 0 {
_ = session.Rollback()
return grmi.NewBusinessError("未获取到开发协议详细规则")
}
for index, rule := range ruleLi {
if rule.MainControlAction != model.CONTROL_ACTION_PSET && rule.MainControlAction != model.CONTROL_ACTION_JOB {
if rule.ControlId != 1 || rule.ControlTime != 1 {
_ = session.Rollback()
return grmi.NewBusinessError("规则明细数据不合规")
}
}
if rule.ControlId >= 10 {
_ = session.Rollback()
return grmi.NewBusinessError("规则明细数据不合规")
}
rule.PO = entity.PO
rule.StepNo = entity.StepNo
rule.StepDesc = entity.StepDesc
rule.OperationId = entity.OperationId
rule.WorkPlaceNr = entity.WorkPlaceNr
ruleLi[index] = rule
}
err = ruleDao.Insert(&ruleLi)
if err != nil {
_ = session.Rollback()
return err
}
_ = session.Commit()
return nil
}

+ 23
- 0
web/controllers/base/TightenWrenchInfo.rest.go View File

@ -380,3 +380,26 @@ func RegisterUpdateTightenWrenchInfo(party router.Party, path string, method fun
RegisterMultiTightenWrenchInfo(party, "PUT", path, method)
}
/******************************************************************************
*
* @Function Name : RegisterSaveOneTightenWrenchInfo
*-----------------------------------------------------------------------------
*
* @Description : 为一个保存单条TightenWrenchInfo的方法注册路由
*
* @Function Parameters : 路由分组
*
* @Function Parameters : 路径
*
* @Function Parameters : 实际处理请求的方法
*
* @Author : zhangxin
*
* @Date : 2021-08-18
*
******************************************************************************/
func RegisterSaveOneTightenWrenchInfo(party router.Party, path string, method func(*models.Usertab, *model.TightenWrenchInfo) error) {
RegisterOneTightenWrenchInfo(party, "POST", path, method)
}

+ 4
- 0
web/controllers/base/base.go View File

@ -1217,6 +1217,8 @@ func RegisterRoutes() {
RegisterUpdateOneOPCBasicComInfo(opcbasiccominfo, "/updateone", serviceOfOPCBasicComInfo.UpdateOne)
// OPCBasicComInfo修改多条
// RegisterUpdateOPCBasicComInfo(opcbasiccominfo, "/update", serviceOfOPCBasicComInfo.Update)
// OPCBasicComInfo保存
RegisterSaveOneOPCBasicComInfo(opcbasiccominfo, "/save", serviceOfOPCBasicComInfo.Save)
// OPCComDetailRule的路由组
opccomdetailrule := party.Party("/opccomdetailrule")
@ -1322,6 +1324,8 @@ func RegisterRoutes() {
RegisterUpdateOneTightenWrenchInfo(tightenwrenchinfo, "/updateone", serviceOfTightenWrenchInfo.UpdateOne)
// TightenWrenchInfo修改多条
// RegisterUpdateTightenWrenchInfo(tightenwrenchinfo, "/update", serviceOfTightenWrenchInfo.Update)
// TightenWrenchInfo保存一条
RegisterSaveOneTightenWrenchInfo(tightenwrenchinfo, "/save", serviceOfTightenWrenchInfo.Save)
// TightenWrenchRuleInfo的路由组
tightenwrenchruleinfo := party.Party("/tightenwrenchruleinfo")


Loading…
Cancel
Save