|
|
@ -306,7 +306,7 @@ func (impl *OperationDAOImplement) UpdateWhere(predicates []grmi.Predicate, enti |
|
|
|
* @Reference LAPP_ACURA_MOM_BACKEND/dao/base/OperationDAO.GetOperationRelData |
|
|
|
* |
|
|
|
******************************************************************************/ |
|
|
|
func (impl *OperationDAOImplement) GetOperationRelData(artIdLi []string, projectId string) ([]model.OperationRelData, error) { |
|
|
|
func (impl *OperationDAOImplement) GetOperationRelData(artIdLi []string, productId string) ([]model.OperationRelData, error) { |
|
|
|
where := fmt.Sprintf("%s = ? and %s = ? and %s = ?", meta.Operation_PlantNr.ColumnName, meta.Operation_ProductId.ColumnName, meta.Operation_ActivateInStation.ColumnName) |
|
|
|
data := make([]model.OperationRelData, 0) |
|
|
|
POCondition := fmt.Sprintf("%s = %s and %s = %s and %s = %s", |
|
|
@ -332,6 +332,6 @@ func (impl *OperationDAOImplement) GetOperationRelData(artIdLi []string, project |
|
|
|
artIdStr += fmt.Sprintf(`'%s'`, artId) |
|
|
|
} |
|
|
|
where += fmt.Sprintf(" and ( %s in (%s) or %s = ?) ", meta.ArticleAtcodLst_ArtId.ColumnName, artIdStr, meta.Operation_AttrCode.ColumnName) |
|
|
|
err := session.Where(where, impl.plantNr, projectId, 1, -1).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data) |
|
|
|
err := session.Where(where, impl.plantNr, productId, 1, -1).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data) |
|
|
|
return data, err |
|
|
|
} |