Merge branch 'dev' into test

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)){