|
|
@ -321,6 +321,6 @@ func (impl *OperationDAOImplement) GetOperationRelData(artIdLi []string, workLin |
|
|
|
} |
|
|
|
where += fmt.Sprintf(" and ( %s in (%s) or %s = ?) ", meta.ArticleAtcodLst_ArtId.ColumnName, artIdStr, meta.Operation_AttrCode.ColumnName) |
|
|
|
//err := session.Where(where, impl.plantNr, workLineId, 1).In(meta.ArticleAtcodLst_ArtId.ColumnName, artIdLi).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data)
|
|
|
|
err := session.Where(where, impl.plantNr, workLineId, workLineId, 1, -1, projectId).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data) |
|
|
|
err := session.Where(where, impl.plantNr, workLineId, workLineId, 1, projectId, -1).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data) |
|
|
|
return data, err |
|
|
|
} |