From 97f4c24dc1311db2fe49bcd0a2f73a4ada29aaec Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 20 Nov 2024 09:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=84=E7=90=86=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E6=A7=BD=E4=BD=8D=E7=BB=91=E5=AE=9A,?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=98=8E=E7=BB=86=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/auth/SysWorkplaceQueueController.java |  5 ++++-
 .../glxp/api/service/basic/UdiProductService.java    | 12 ++++++------
 .../service/collect/IoCollectOrderBackupService.java |  4 ++--
 .../collect/IoCollectOrderCodeManService.java        |  7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
index dce7540ec..f102270cd 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
@@ -261,11 +261,14 @@ public class SysWorkplaceQueueController extends BaseController {
         }
 
 
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(request.getUdiCode());
+        if (udiEntity != null && StrUtil.isNotEmpty(udiEntity.getUdi())) {
+            udiCode = udiEntity.getUdi();
+        }
         UdiProductEntity byNameCode = udiProductService.findByNameCode(udiCode);
         if (byNameCode == null) {
             return ResultVOUtils.error("无法识别该编码");
         }
-
         String relId = byNameCode.getRelId();
         List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId));
         if (CollUtil.isNotEmpty(list)) {
diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
index 5f1151da6..569393db9 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
@@ -110,12 +110,12 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
     public UdiProductEntity findByNameCode(String nameCode) {
 //        String prefix = FilterUdiUtils.getDiStr(nameCode);
 
-        if (nameCode.length() > 13) {
-            UdiEntity udiEntity = FilterUdiUtils.getUdi(nameCode);
-            if (udiEntity != null) {
-                nameCode = udiEntity.getUdi();
-            }
-        }
+//        if (nameCode.length() > 13) {
+//            UdiEntity udiEntity = FilterUdiUtils.getUdi(nameCode);
+//            if (udiEntity != null) {
+//                nameCode = udiEntity.getUdi();
+//            }
+//        }
         return udiProductDao.findByNameCode(nameCode);
     }
 
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index 7339571b1..303bbdd48 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -150,9 +150,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             if (StrUtil.isNotEmpty(collectOrderBizResponse.getReplaceCode())) {
                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getReplaceCode());
             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
-                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode());
+                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) {
-                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getSplitUdiCode());
+                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getSplitUdiCode() == null ? "" : collectOrderBizResponse.getSplitUdiCode().substring(1));
             }
 
             collectOrderBizResponses.add(collectOrderBizResponse);
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 ffe9b146a..d1722f4ea 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -153,15 +153,16 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         else udiRelevanceResponse = udiRelevanceResponses.get(0);
         //判断层级标识是否正确
         if (IntUtil.value(sysWorkplaceDocumentEntity.getOrderCirType()) == 2) {
-            if (IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) {
+            if (udiRelevanceResponse.getUseMaxLevel() !=null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) {
                 throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
             }
-            if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) {
+            if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) {
                 throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
             }
-            if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) {
+            if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) {
                 throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
             }
+
         } else {
             if (udiRelevanceResponse.getDistributeMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
                 throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");