From 941a85db30fad30e5707e897ac2153c8da45c9f1 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 10 Sep 2024 15:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=AB=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/collect/IoCollectOrderCodeManController.java  | 3 ++-
 .../api/controller/collect/IoCollectOrderController.java     | 5 +++--
 .../com/glxp/api/controller/inout/IoCodeTempController.java  | 4 +++-
 .../glxp/api/entity/basic/SysWorkplaceDocumentEntity.java    | 2 +-
 .../api/service/collect/IoCollectOrderCodeManService.java    | 1 -
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
index 673272fa5..ac8108402 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
@@ -99,10 +99,11 @@ public class IoCollectOrderCodeManController extends BaseController {
                 vailCodeResultResponse.setCode(code);
                 try {
                     collectOrder = collectOrderCodeManService.prescribeTagCode(addTagCodeReqeust);
-                } catch (JSONException e) {
+                } catch (Exception e) {
                     vailCodeResultResponse.setErrMsg(e.getMessage());
                     vailCodeResultResponse.setStatus(2);
                 }
+                vailCodeResultResponses.add(vailCodeResultResponse);
             }
         }
         vailTagResultResponse.setCollectOrder(collectOrder);
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..98a0883d6 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -388,8 +388,10 @@ public class IoCodeTempController extends BaseController {
             AddOrderRequest addOrderRequest = new AddOrderRequest();
             BeanUtils.copyProperties(addOrderCodeRequest, addOrderRequest);
             if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
+            code = code.trim();
             if (code.endsWith("\u001D")) {
                 code = code.replace("\u001D", "");
+
             }
             UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
             if (udiEntity == null)
@@ -438,7 +440,7 @@ public class IoCodeTempController extends BaseController {
             vailCodeResultResponses.add(vailCodeResultResponse);
         }
         addCodeResult.setVailCodeResultResponses(vailCodeResultResponses);
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(addCodeResult);
     }
 
 
diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
index 58f61e4f2..6e3d805e9 100644
--- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
@@ -148,7 +148,7 @@ public class SysWorkplaceDocumentEntity {
     private Integer monopoly;
 
     /**
-     * 单据完成校验： 0:完全赋码 ; 1:部分赋码
+     * 单据完成校验： 0:完全赋码 ; 1:部分赋码，2：赋码超出
      */
     @TableField(value = "orderFinishVerify")
     private Integer orderFinishVerify;
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
index ee862f409..7d1cfa3db 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -255,7 +255,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             } else {
                                 collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + calCountUtil.getUseActCount(udiRelevanceResponse));
                             }
-
                         }
                     }
                     break;