From 3e1b3cd16f10ce56e439120c326efc54b83200a6 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 10 Sep 2024 09:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/collect/IoCollectOrderController.java     | 5 +++--
 .../com/glxp/api/controller/inout/IoCodeTempController.java  | 1 +
 .../mybatis/mapper/collect/IoCollectOrderMapper.xml          | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 0a90cfe31..0e956cf7a 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -57,19 +57,20 @@ public class IoCollectOrderController extends BaseController {
 
     @Resource
     private BasicCollectUserService basicCollectUserService;
+
     @GetMapping("/udiwms/basic/collect/order/filter")
     public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;
-        if (collectOrderRequest.getWorkPlaceCode() == null){
+        if (collectOrderRequest.getWorkPlaceCode() == null) {
             Long userId = getUserId();
             BasicCollectUserRequest request = new BasicCollectUserRequest();
             request.setPage(1);
             request.setLimit(100);
             request.setUserId(userId.toString());
             page = basicCollectUserService.filterList(request);
-            if (page != null){
+            if (page != null) {
                 workPlaceCodes = page.stream()
                         .map(UserWorkResponse::getWorkplaceId)
                         .collect(Collectors.toList());
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index a4b9a81b5..84cc393c8 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -348,6 +348,7 @@ public class IoCodeTempController extends BaseController {
         List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
         for (String code : codeList) {
             VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
+            code = code.replace("\r\n", "");
             UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
             vailCodeResultResponse.setCode(code);
             vailCodeResultResponse.setStatus(1);
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 26c344586..13e9fdc11 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -104,6 +104,8 @@
         GROUP BY
         ico.billNo
         order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
+
+
     </select>