diff --git a/dao/base/implments/Operation.dao.impl.go b/dao/base/implments/Operation.dao.impl.go index f0d46b2..f6e1f0b 100644 --- a/dao/base/implments/Operation.dao.impl.go +++ b/dao/base/implments/Operation.dao.impl.go @@ -311,8 +311,8 @@ func (impl *OperationDAOImplement) GetOperationRelData(artIdLi []string, workLin data := make([]model.OperationRelData, 0) POCondition := fmt.Sprintf("%s = %s and %s = %s", meta.Operation_PlantNr.ColumnName, meta.Process_PlantNr.ColumnName, meta.Operation_PO.ColumnName, meta.Process_PO.ColumnName) artCondition := fmt.Sprintf("%s = %s and %s = %s and %s = %s", meta.Operation_PlantNr.ColumnName, meta.ArticleAtcodLst_PlantNr.ColumnName, meta.Operation_AttrCode.ColumnName, meta.Operation_AttrCode.ColumnName, meta.Operation_AttrValue.ColumnName, meta.ArticleAtcodLst_AttrValue.ColumnName) - stepCondition := fmt.Sprintf("%s = %s and %s = %s", meta.Operation_PlantNr.ColumnName, meta.StepType_PlantNr.ColumnName, meta.Operation_StepType.ColumnName, meta.StepType_StepTypeName.ColumnName) - session := impl.session.Table(impl.meta.TableName).Join("LEFT", meta.Process.TableName, POCondition).Join("LEFT", meta.ArticleAtcodLst.TableName, artCondition).Join("LEFT", meta.StepType.TableName, stepCondition) + //stepCondition := fmt.Sprintf("%s = %s and %s = %s", meta.Operation_PlantNr.ColumnName, meta.StepType_PlantNr.ColumnName, meta.Operation_StepType.ColumnName, meta.StepType_StepTypeName.ColumnName) + session := impl.session.Table(impl.meta.TableName).Join("LEFT", meta.Process.TableName, POCondition).Join("LEFT", meta.ArticleAtcodLst.TableName, artCondition) err := session.Where(where, impl.plantNr, workLineId).In(meta.ArticleAtcodLst_ArtId.ColumnName, artIdLi).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data) return data, err } \ No newline at end of file diff --git a/models/base/base.go b/models/base/base.go index 3e331ca..fd9f52c 100644 --- a/models/base/base.go +++ b/models/base/base.go @@ -106,7 +106,7 @@ type OperationRelData struct { Operation `xorm:"extends"` Process `xorm:"extends"` ArticleAtcodLst `xorm:"extends"` - StepType `xorm:"extends"` + //StepType `xorm:"extends"` } /******************************************************************************