From 778d3d8b387ca0a8d1b51ef68f783fb0b407ef20 Mon Sep 17 00:00:00 2001 From: wujian <14790700720@163.com> Date: 星期五, 26 七月 2024 11:52:34 +0800 Subject: [PATCH] fix6 --- jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java index ebfaa83..e5f44cd 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java @@ -1,6 +1,8 @@ package com.jcdm.main.da.tileMatchMiddleware.controller; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -158,7 +160,8 @@ rMiddleware.setState(1); List<DaTileMatchMiddleware> TileMatchMiddlewareList=daTileMatchMiddlewareService.selectDaTileMatchMiddlewareList(rMiddleware); String SNCode=""; - if(TileMatchMiddlewareList.size()>0){ + if(CollUtil.isNotEmpty(TileMatchMiddlewareList)){ + TileMatchMiddlewareList = TileMatchMiddlewareList.stream().sorted(Comparator.comparing(DaTileMatchMiddleware::getCreateTime)).collect(Collectors.toList()); rMiddleware=TileMatchMiddlewareList.get(0); rMiddleware.setPalletNo(locationCode); rMiddleware.setConnectingrodNo(barcode); -- Gitblit v1.9.3