diff --git a/dao/om/implments/WorkOrder.dao.impl.go b/dao/om/implments/WorkOrder.dao.impl.go index 57ee346..a9b96f1 100644 --- a/dao/om/implments/WorkOrder.dao.impl.go +++ b/dao/om/implments/WorkOrder.dao.impl.go @@ -596,13 +596,14 @@ func (impl *WorkOrderDAOImplement) SelectLockWorkOrder(workLineId string) ([]mod meta.WorkOrderQty_WorkOrderId.ColumnName) session = session.Join("LEFT", meta.WorkOrderStatus.TableName, statusCondition) session = session.Join("LEFT", meta.WorkOrderQty.TableName, qtyCondition) - where := fmt.Sprintf("%s = ? and %s = ? and %s = ? and (%s = ? or %s = ?)", + where := fmt.Sprintf("%s = ? and %s = ? and %s = ? and (%s = ? or %s = ? or %s = ?)", meta.WorkOrder_PlantNr.ColumnName, meta.WorkOrder_PlanResourceId.ColumnName, meta.WorkOrder_ProjectId.ColumnName, meta.WorkOrderStatus_Status.ColumnName, + meta.WorkOrderStatus_Status.ColumnName, meta.WorkOrderStatus_Status.ColumnName) - err := session.Where(where, impl.plantNr, workLineId, common.ProjectId, common.WO_STATUS_LOCKED, common.WO_STATUS_RUNNING).Asc(meta.WorkOrder_PlanStartTime.ColumnName).Find(&data) + err := session.Where(where, impl.plantNr, workLineId, common.ProjectId, common.WO_STATUS_LOCKED, common.WO_STATUS_RELEASED, common.WO_STATUS_RUNNING).Asc(meta.WorkOrder_PlanStartTime.ColumnName).Find(&data) if err != nil { return nil, err }