From 9bc91e1158f1bc2f770a58746f44a7d2322f6671 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 27 Jul 2023 14:59:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=80=81=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=88=B0=E6=96=B0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=B2=A1=E6=9C=89warehouseId=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/pan/service/impl/PanFactoryDataServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
index 5e6c8ac8d..d9dc9d924 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
@@ -367,7 +367,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 
 				distributionStockArticleEntity.setWarehouse(destinationWarehouse);
-				distributionStockArticleEntity.setWarehouseId(distributionStockArticleEntity.getId());
+				distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId());
 
 				distributionStockArticleEntity.setWarehouseEntryTime(date);
 				distributionStockArticleEntity.setTotalNumber(total);
@@ -438,7 +438,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			BeanUtil.copyProperties(vo,entity);
 			entity.setConditions(1);
 			entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
-			entity.setWarehouseId(distributionStockArticleEntity.getId());
+			entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
 			entity.setStockArticleId(id);
 			// 绑定部门--仓库
 			if(!Objects.isNull(basicdataWarehouseEntity)){