From ea708c53038e063981a4a749589d53b022b43567 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 22 Feb 2024 10:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoCodeTempController.java | 10 +++++----- .../controller/inout/IoOrderDetailBizController.java | 2 +- .../api/controller/inv/InvPreinOrderController.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 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 83ca997c3..291f72ef8 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -951,17 +951,17 @@ public class IoCodeTempController extends BaseController { } } - InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode()); +// InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode()); if (count <= 0) { if (count == -1) { return ResultVOUtils.error(500, "该产品未入库"); } else return ResultVOUtils.error(500, "预验收库存数量不足！"); } else { - if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) - && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) { - return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); - } +// if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) +// && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) { +// return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); +// } if (StrUtil.isNotEmpty(codeTempEntity.getOrderId())) {//非首次添加 if (StrUtil.isEmpty(codeTempEntity.getSerialNo())) {//该单据已有该产品 //无序列号，则可能存在多个预验收入库单 diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index b7394d7dc..e64885b9d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -251,7 +251,7 @@ public class IoOrderDetailBizController extends BaseController { Integer count = invProductDetailService.vailStockCount(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getSupId(), null, outInvCode, null); count = IntUtil.value(count) - orderDetailBizEntity.getCount(); - if (count <= 0) { + if (count < 0) { if (count == -1) { return ResultVOUtils.error(500, "该产品未入库"); } else diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index b15ec40e1..82df88b67 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -146,14 +146,14 @@ public class InvPreinOrderController extends BaseController { } } - InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(checkPreInInvRequest.getCode()); +// InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(checkPreInInvRequest.getCode()); if (count <= 0) { return ResultVOUtils.error(500, "预验收库存数量不足！"); } else { - if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(checkPreInInvRequest.getBatchNo()) - && !invPreinDetailEntity.getBatchNo().equals(checkPreInInvRequest.getBatchNo())) { - return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); - } +// if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(checkPreInInvRequest.getBatchNo()) +// && !invPreinDetailEntity.getBatchNo().equals(checkPreInInvRequest.getBatchNo())) { +// return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); +// } } return ResultVOUtils.success(count); }