From 305d3f8805530129c35d5a40824b29f74ae8692d Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Mon, 11 Nov 2024 21:00:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/WarehouseReceiptService.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java index bff877fc..cfba2b91 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java @@ -5,6 +5,7 @@ import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; import cn.lihongjie.coal.exception.BizException; import cn.lihongjie.coal.warehouseGoods.dto.GoodsCountRequest; +import cn.lihongjie.coal.warehouseGoods.dto.WarehouseGoodsDto; import cn.lihongjie.coal.warehouseGoods.service.WarehouseGoodsService; import cn.lihongjie.coal.warehouseReceipt.dto.CreateWarehouseReceiptDto; import cn.lihongjie.coal.warehouseReceipt.dto.UpdateWarehouseReceiptDto; @@ -24,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.Page; @@ -101,13 +103,22 @@ public class WarehouseReceiptService Integer goodsCount = warehouseGoodsService.goodsCount(request); + WarehouseGoodsDto goods = warehouseGoodsService.getById(warehouseReceiptDetailEntity.getGoods().getId()); if (ObjectUtils.notEqual(goodsCount, warehouseReceiptDetailEntity.getNumber())){ throw new BizException("商品 " + - warehouseGoodsService.getById(warehouseReceiptDetailEntity.getGoods().getId()).getName() + + goods.getName() + "库存数量发生变化, 请重新操作"); } + if (StringUtils.equals(entity.getReceiptType(), "1")){ + if (goodsCount < warehouseReceiptDetailEntity.getNumber()){ + throw new BizException("商品 " + + goods.getName() + + "库存数量不足"); + } + } + }