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