From 7fefd6dc2408a94795e232a8c293f4e1709ea048 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 30 Jul 2023 10:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=9F=A5=E8=AF=A2=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/inv/UdiTraceController.java    | 10 +++-------
 src/main/java/com/glxp/api/task/VailInvTask.java       |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java
index d4e491e4d..28ac37129 100644
--- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java
+++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java
@@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -137,7 +134,7 @@ public class UdiTraceController {
         if (filterCodeTraceRequest.getCode() == null) {
             return ResultVOUtils.success();
         }
-        System.out.println(filterCodeTraceRequest+"---------------------------------------------");
+        System.out.println(filterCodeTraceRequest + "---------------------------------------------");
         UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeTraceRequest.getCode());
         if (udiEntity == null) {
             return ResultVOUtils.error(500, "无效条码");
@@ -205,8 +202,6 @@ public class UdiTraceController {
                 mInvProductDetailEntities.addAll(invProductDetailEntities);
             }
         }
-
-
         if (mInvProductDetailEntities.size() > 0) {
             Map<String, String> filterMap = new HashMap<>();
 
@@ -222,6 +217,7 @@ public class UdiTraceController {
             filterOrderRequest.setPage(filterCodeTraceRequest.getPage());
             filterOrderRequest.setLimit(filterCodeTraceRequest.getLimit());
             List<IoOrderResponse> orderEntities = orderService.filterList(filterOrderRequest);
+            Collections.sort(orderEntities, Comparator.comparing(IoOrderResponse::getCreateTime));
             PageInfo<IoOrderResponse> pageInfo;
             pageInfo = new PageInfo<>(orderEntities);
             PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/task/VailInvTask.java b/src/main/java/com/glxp/api/task/VailInvTask.java
index 058d362e1..b42d97bbf 100644
--- a/src/main/java/com/glxp/api/task/VailInvTask.java
+++ b/src/main/java/com/glxp/api/task/VailInvTask.java
@@ -24,8 +24,8 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Slf4j
-@Component
-@Transactional(rollbackFor = Exception.class)
+//@Component
+//@Transactional(rollbackFor = Exception.class)
 public class VailInvTask implements SchedulingConfigurer {