|
|
@ -353,7 +353,7 @@ func (impl *SerialOrderDAOImplement) UpdateWhere(predicates []grmi.Predicate, en |
|
|
|
* @Reference LAPP_GAAS_GFrame_BACKEND/dao/om/SerialOrderDAO.SelectByWorkOrderId |
|
|
|
* |
|
|
|
******************************************************************************/ |
|
|
|
func (impl *SerialOrderDAOImplement) SelectByWorkOrderId(workOrderId string) (serialOrderLi []model.SerialOrder, err error) { |
|
|
|
func (impl *SerialOrderDAOImplement) SelectByWorkOrderId(workOrderId string, status int) (serialOrderLi []model.SerialOrder, err error) { |
|
|
|
data := make([]model.VOmSerialorder, 0) |
|
|
|
|
|
|
|
session := impl.session.Table(impl.meta.TableName) |
|
|
@ -366,7 +366,8 @@ func (impl *SerialOrderDAOImplement) SelectByWorkOrderId(workOrderId string) (se |
|
|
|
meta.SerialOrder_PlantNr.ColumnName, |
|
|
|
meta.SerialOrder_WorkOrderId.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) |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
} |
|
|
|