diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java index 5b80a96a..6a0157bf 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java @@ -109,6 +109,8 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime"))); + if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java index 4f65e49d..13afecc6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java @@ -105,6 +105,8 @@ public class InvoiceServiceImpl implements InvoiceService { Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime"))); + if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java index 69c58204..2f57443c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java @@ -90,6 +90,7 @@ public class OutSourceInspectionCertificateServiceImpl implements OutSourceInspe Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime"))); String outSourceProcessSheetCode = criteria.getOutSourceProcessSheetCode(); if(!StringUtils.isEmpty(outSourceProcessSheetCode)){ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java index 8bb5bf07..56f7975b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java @@ -101,6 +101,8 @@ public class OutSourceProcessSheetServiceImpl implements OutSourceProcessSheetSe Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime"))); + if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ConsumablesPurchaseOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ConsumablesPurchaseOrderServiceImpl.java index dac052fd..1bdfd15b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ConsumablesPurchaseOrderServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ConsumablesPurchaseOrderServiceImpl.java @@ -134,6 +134,8 @@ public class ConsumablesPurchaseOrderServiceImpl implements ConsumablesPurchaseO Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime"))); + if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ProductPurchaseOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ProductPurchaseOrderServiceImpl.java index 3dd36c59..069927de 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ProductPurchaseOrderServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ProductPurchaseOrderServiceImpl.java @@ -135,6 +135,8 @@ public class ProductPurchaseOrderServiceImpl implements ProductPurchaseOrderServ Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime"))); + if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java index ce703735..28c3fba4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java @@ -102,6 +102,8 @@ public class QualityCheckSheetServiceImpl implements QualityCheckSheetService { Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime"))); + if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{