|
|
@ -367,7 +367,7 @@ func (impl *SerialOrderDAOImplement) SelectByWorkOrderId(workOrderId string, sta |
|
|
meta.SerialOrder_WorkOrderId.ColumnName, |
|
|
meta.SerialOrder_WorkOrderId.ColumnName, |
|
|
meta.SerialOrderStatus_Status.ColumnName) |
|
|
meta.SerialOrderStatus_Status.ColumnName) |
|
|
//err = session.Join("LEFT", meta.SerialOrderStatus.TableName, condition).Where(where, impl.plantNr, workOrderId, common.WO_STATUS_LOCKED).Asc(meta.SerialOrder_SerialOrderId.ColumnName).Find(&data)
|
|
|
//err = session.Join("LEFT", meta.SerialOrderStatus.TableName, condition).Where(where, impl.plantNr, workOrderId, common.WO_STATUS_LOCKED).Asc(meta.SerialOrder_SerialOrderId.ColumnName).Find(&data)
|
|
|
err = session.Join("LEFT", meta.SerialOrderStatus.TableName, condition).Where(where, impl.plantNr, workOrderId, status).Asc(meta.SerialOrder_SerialOrderId.ColumnName).Find(&data) |
|
|
|
|
|
|
|
|
err = session.Join("LEFT", meta.SerialOrderStatus.TableName, condition).Where(where, impl.plantNr, workOrderId, status).Asc(meta.SerialOrder_Sort.ColumnName).Find(&data) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return nil, err |
|
|
return nil, err |
|
|
} |
|
|
} |
|
|
|
