|
|
@ -339,8 +339,11 @@ func (impl *SerialOrderOPDetailRecvDataLstDAOImplement) SelectOPDetailData(seria |
|
|
|
meta.SerialOrder_PlantNr.ColumnName, |
|
|
|
meta.SerialOrderOPDetailRecvDataLst_SerialOrderId.ColumnName, |
|
|
|
meta.SerialOrder_SerialOrderId.ColumnName) |
|
|
|
session := impl.session.Table(impl.meta.TableName).Join("LEFT", meta.SerialOrderOPDetail.TableName, detailCondition).Join("LEFT", baseMeta.OPCComRule.TableName, opcCondition).Join("LEFT", baseMeta.Operation.TableName, operationCondition) |
|
|
|
session = session.Join("LEFT", meta.SerialOrder.TableName, serialOrderCondition) |
|
|
|
session := impl.session.Table(impl.meta.TableName). |
|
|
|
Join("LEFT", meta.SerialOrderOPDetail.TableName, detailCondition). |
|
|
|
Join("LEFT", baseMeta.OPCComRule.TableName, opcCondition). |
|
|
|
Join("LEFT", baseMeta.Operation.TableName, operationCondition). |
|
|
|
Join("LEFT", meta.SerialOrder.TableName, serialOrderCondition) |
|
|
|
parameters := []interface{}{impl.plantNr, serialOrderId} |
|
|
|
where := fmt.Sprintf("%s = ? and %s = ?", meta.SerialOrderOPDetailRecvDataLst_PlantNr.ColumnName, meta.SerialOrderOPDetailRecvDataLst_SerialOrderId.ColumnName) |
|
|
|
if PO != 0 { |
|
|
@ -351,9 +354,9 @@ func (impl *SerialOrderOPDetailRecvDataLstDAOImplement) SelectOPDetailData(seria |
|
|
|
where += fmt.Sprintf(" and %s = ?", meta.SerialOrderOPDetailRecvDataLst_WorkPlaceNr.ColumnName) |
|
|
|
parameters = append(parameters, workPlaceNr) |
|
|
|
} |
|
|
|
err := session.Where(where, parameters...).Asc(meta.SerialOrderOPDetailRecvDataLst_PO.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_StepNo.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_OriginPos.ColumnName).Find(&data) |
|
|
|
err := session.Select("OM_SerialOrder.*,OM_SerialOrderOPDetailRecvDataLst.*,OM_SerialOrderOPDetail.*,OPCComRule.*,Operation.*").Where(where, parameters...).Asc(meta.SerialOrderOPDetailRecvDataLst_PO.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_StepNo.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_OriginPos.ColumnName).Find(&data) |
|
|
|
if err != nil { |
|
|
|
return nil, grmi.NewDataBaseError(err) |
|
|
|
} |
|
|
|
return data, nil |
|
|
|
} |
|
|
|
} |