Browse Source

通过workOrderId进行搜索时,传入状态

pull/384/head
zhangxin 3 years ago
parent
commit
c45af99ce2
2 changed files with 4 additions and 3 deletions
  1. +1
    -1
      dao/om/SerialOrder.dao.go
  2. +3
    -2
      dao/om/implments/SerialOrder.dao.impl.go

+ 1
- 1
dao/om/SerialOrder.dao.go View File

@ -241,7 +241,7 @@ type SerialOrderDAO interface {
* @Date : 2021-04-20 13:07:32
*
******************************************************************************/
SelectByWorkOrderId(workOrderId string) ([]model.SerialOrder, error)
SelectByWorkOrderId(workOrderId string, status int) ([]model.SerialOrder, error)
/******************************************************************************
*
* @Function Name : SelectInfo


+ 3
- 2
dao/om/implments/SerialOrder.dao.impl.go View File

@ -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
}


Loading…
Cancel
Save