diff --git a/dao/pln/implments/ToyotaCalloff.dao.impl.go b/dao/pln/implments/ToyotaCalloff.dao.impl.go index 75a5c40..752bcce 100644 --- a/dao/pln/implments/ToyotaCalloff.dao.impl.go +++ b/dao/pln/implments/ToyotaCalloff.dao.impl.go @@ -322,17 +322,17 @@ func (impl *ToyotaCalloffDAOImplement) SelectAndPaging(paging *grmi.Paging, pred return grmi.EmptyPagingResult, err } - orderBy := " order by " + meta.ToyotaCalloff_PlantNr.ColumnName - if orderByFields != nil { - for _, field := range orderByFields { - if orderBy == " order by " { - orderBy += field.ColumnName - } else { - orderBy += ", " + field.ColumnName - } - } - } - //orderBy := " order by " + meta.ToyotaCalloff_RecordId.SortColumnName + " desc " + //orderBy := " order by " + meta.ToyotaCalloff_PlantNr.ColumnName + //if orderByFields != nil { + // for _, field := range orderByFields { + // if orderBy == " order by " { + // orderBy += field.ColumnName + // } else { + // orderBy += ", " + field.ColumnName + // } + // } + //} + orderBy := " order by " + meta.ToyotaCalloff_RecordId.SortColumnName + " desc " parameters = append(parameters, paging.Offset(), paging.Size) data := make([]model.ToyotaCalloff, 0, 10) where = " where " + where diff --git a/services/pln/implments/ToyotaDeliveryOrder.service.impl.go b/services/pln/implments/ToyotaDeliveryOrder.service.impl.go index fffcd3d..1e4e914 100644 --- a/services/pln/implments/ToyotaDeliveryOrder.service.impl.go +++ b/services/pln/implments/ToyotaDeliveryOrder.service.impl.go @@ -370,7 +370,7 @@ func (impl *ToyotaDeliveryOrderServiceImplement) WriteDeliveryDataToPLCTask() { } common.ToyotaWriteCallOffToPLCStatus = 1 defer func() { - common.ToyotaExtractCallOffTaskStatus = 0 + common.ToyotaWriteCallOffToPLCStatus = 0 }() log, _ := logger.NewLogger("CallOff", "JIT") engine := db.Eloquent.Master()