From aa09b71491cc653b197f8b0e9759c53e17f49b2c Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Sat, 2 Dec 2023 09:56:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E4=B8=8A=E6=9E=B6=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81=E7=9A=84=E6=95=B0=E9=87=8F=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseUpdownTypeServiceImpl.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 81f80109c..20a64cf2d 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -2193,8 +2193,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper);
 			DistributionStockListEntity stockListEntity = distributionStockListClient.getEntityByMarketIdAndMaterialCodeAndIncomingBatch(marketId, materialCode,incomingBatch,warehouseId);
 			//查询原库存数量
-			Integer num1 =	warehouseUpdownGoodsService.getNumByZation(stockListEntity.getId());
-			if (num1+enterNum>stockListEntity.getQuantityStock()){
+			Integer totalNum = 0 ;
+			List<PositionVO> updownGoodsByStock = warehouseUpdownGoodsService.getUpdownGoodsByStock(marketId, materialCode, incomingBatch,warehouseId);
+			List<PositionVO> trayGoodsByStock = warehouseTrayGoodsService.getTrayGoodsByStockNoAllocationId(marketId, materialCode, incomingBatch,warehouseId);
+			updownGoodsByStock.addAll(trayGoodsByStock);
+			for (PositionVO positionVO:updownGoodsByStock){
+				totalNum = totalNum + positionVO.getNum();
+			}
+			if (totalNum+enterNum>stockListEntity.getQuantityStock()){
 				stringBuffer.append("{").append(materialCode).append("},");
 				continue;
 			}