Browse Source

从mes一次同步10条改为一次同步所有符合条件的

pull/450/head
zhangxin 3 years ago
parent
commit
62999445ef
3 changed files with 37 additions and 1 deletions
  1. +1
    -0
      dao/api/ACCWOWORKORDERHEADER.dao.go
  2. +35
    -0
      dao/api/implments/ACCWOWORKORDERHEADER.dao.impl.go
  3. +1
    -1
      services/om/implments/OmToMes.serivce.impl.go

+ 1
- 0
dao/api/ACCWOWORKORDERHEADER.dao.go View File

@ -236,6 +236,7 @@ type ACCWOWORKORDERHEADERDAO interface {
*
******************************************************************************/
UpdateForQty(*model.ACCWOWORKORDERHEADER, int) error
SelectWithoutLimit(predicates []grmi.Predicate, orderByFields []grmi.Field) ([]model.ACCWOWORKORDERHEADER, error)
}
/******************************************************************************


+ 35
- 0
dao/api/implments/ACCWOWORKORDERHEADER.dao.impl.go View File

@ -305,4 +305,39 @@ func (impl *ACCWOWORKORDERHEADERDAOImplement) UpdateForQty(entity *model.ACCWOWO
return grmi.NewBusinessError("对应的mes WorkOrder数据已更新")
}
return nil
}
/******************************************************************************
*
* @Reference LAPP_GAAS_GFrame_BACKEND/dao/api/ACCWOWORKORDERHEADERDAO.Select
*
******************************************************************************/
func (impl *ACCWOWORKORDERHEADERDAOImplement) SelectWithoutLimit(predicates []grmi.Predicate, orderByFields []grmi.Field) ([]model.ACCWOWORKORDERHEADER, error) {
parameters := []interface{}{}
where := "1 = 1"
session := impl.session.Table(impl.meta.TableName)
if predicates != nil {
for _, predicate := range predicates {
where += predicate.Build()
parameters = append(parameters, predicate.Values...)
}
session = session.Where(where, parameters...)
} else {
session = session.Where(where, parameters...)
}
if orderByFields != nil {
for _, field := range orderByFields {
session = session.OrderBy(field.ColumnName)
}
}
data := make([]model.ACCWOWORKORDERHEADER, 0, 10)
err := session.Find(&data)
if err != nil {
return nil, grmi.NewDataBaseError(err)
}
return data, nil
}

+ 1
- 1
services/om/implments/OmToMes.serivce.impl.go View File

@ -294,7 +294,7 @@ func (impl *OmToMesServiceImplement) FeedbackFromMes(plantNr int) {
serialOrderStatusRecDao := dal.NewSerialOrderStatusRecLstDAO(session, plantNr, user)
// 获取status是 MesOrderStatusRelease 的header list
headerLi, err := headerDao.Select([]grmi.Predicate{apiMeta.ACCWOWORKORDERHEADER_STATUS.NewPredicate(grmi.Equal, model.MesOrderStatusRelease)}, []grmi.Field{apiMeta.ACCWOWORKORDERHEADER_WONO}, 10)
headerLi, err := headerDao.SelectWithoutLimit([]grmi.Predicate{apiMeta.ACCWOWORKORDERHEADER_STATUS.NewPredicate(grmi.Equal, model.MesOrderStatusRelease)}, []grmi.Field{apiMeta.ACCWOWORKORDERHEADER_WONO})
if err != nil {
log.Error("FeedbackFromMes get header data from mes db failed, error:"+err.Error(), "feedback id:"+feedbackId)
_ = mesSession.Rollback()


Loading…
Cancel
Save