From 506c61bf64ab2e91778b54e1fba4df12e895aac7 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 9 Mar 2024 16:00:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A3=80=E9=AA=8C=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/inout/IoOrderController.java | 2 +- .../api/service/inout/IoCheckInvService.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index b0a038795..17b4222ef 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1277,7 +1277,7 @@ public class IoOrderController extends BaseController { } int count = 0; count = invProductDetailService.vailStockCount(bizEntity.getBindRlFk(), bizEntity.getBatchNo(), bizEntity.getSupId(), null, outInvCode, null, true); - if (count <= 0) { + if (count < 0) { if (count == -1) { return ResultVOUtils.error(500, "该产品未入库"); } else diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java index a55a7dd23..4b72c8979 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java @@ -40,21 +40,21 @@ public class IoCheckInvService { BaseResponse invRes = null; if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) { if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 2)) { //校验预验收库存 - invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false); + invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, true); } if (bussinessTypeEntity.isAdvancePreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 3)) { //校验寄售库存 - invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false); + invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, true); } if (bussinessTypeEntity.isVailInv() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 1)) { - invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false); + invRes = checkInv(bussinessTypeEntity, genDetaiEntity, true); } } else { if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false); + invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, true); } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false); + invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, true); } else { - invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false); + invRes = checkInv(bussinessTypeEntity, genDetaiEntity, true); } } return invRes; @@ -99,7 +99,7 @@ public class IoCheckInvService { count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), true); } } - if (count <= 0) { + if (count < 0) { if (count == -1) { return ResultVOUtils.error(500, "该产品未入库"); } else @@ -184,7 +184,7 @@ public class IoCheckInvService { } } // InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode()); - if (count <= 0) { + if (count < 0) { if (count == -1) { return ResultVOUtils.error(500, "该产品未入库"); } else @@ -255,7 +255,7 @@ public class IoCheckInvService { count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode()); } } - if (count <= 0) { + if (count < 0) { if (count == -1) { return ResultVOUtils.error(500, "该产品未入库"); } else