From b7ff531f30b9bcbf1ebe34cae577219c25ea80a7 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 1 Oct 2024 10:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/inout/IoCodeTempController.java   | 8 ++++----
 .../api/service/collect/IoCollectOrderCodeManService.java | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

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 0cc37d59d..394aaf9c9 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -750,7 +750,7 @@ public class IoCodeTempController extends BaseController {
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
         //判断层级标识是否正确
         if (bussinessTypeEntity.isUse()) {
-            if (IntUtil.value(udiRelevanceResponse.getUseMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+            if (IntUtil.value(udiRelevanceResponse.getUseMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
                 return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
             }
             if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) {
@@ -758,7 +758,7 @@ public class IoCodeTempController extends BaseController {
             }
 
         } else {
-            if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+            if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
                 return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
             }
             if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getDistributeLevel())) {
@@ -1236,7 +1236,7 @@ public class IoCodeTempController extends BaseController {
 
         //判断层级标识是否正确
         if (bussinessTypeEntity.isUse()) {
-            if (IntUtil.value(udiRelevanceResponse.getUseMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+            if (IntUtil.value(udiRelevanceResponse.getUseMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
                 return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
             }
             if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) {
@@ -1244,7 +1244,7 @@ public class IoCodeTempController extends BaseController {
             }
 
         } else {
-            if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+            if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
                 return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
             }
             if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getDistributeLevel())) {
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 0eaedbfca..6f8899541 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -139,7 +139,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
             }
 
         } else {
-            if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+            if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
                 throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
             }
             if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getDistributeLevel())) {
@@ -200,6 +200,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
             collectOrderBizService.saveOrUpdate(collectOrderBiz);
         } else if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_VAIL_BATCH) {
             collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo());
+            collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode());
             if (collectOrder == null)
                 throw new JsonException(500, "单据不存在！");
             //3.校验该UDI码是否已经出库（是否在预出库队列）
@@ -207,10 +208,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
 //            if (!b1) {
 //                return ResultVOUtils.error(500, "该追溯码未上货，无法使用！");
 //            }
-
             collectOrderBiz = vailByBatchNo(udiRelevanceResponses, collectOrderBizs, udiEntity);
-
-
             switch (sysWorkplaceDocumentEntity.getCheckInsert()) {
                 case 1: //插入
                     if (collectOrderBiz == null) {
@@ -290,9 +288,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                     break;
             }
 
-
         } else if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_UNVAIL_BATCH) {
             collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo());
+            collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode());
             if (collectOrder == null)
                 throw new JsonException(500, "单据不存在！");
             //按单不校验三期