From 20f309f553d2b55dae87b5247c553fd739f5059f Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 19 Jul 2024 17:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=89=98=E8=A3=85=E8=BD=A6BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DistributionParcelListController.java            | 1 +
 .../service/impl/DistributionDeliveryListServiceImpl.java       | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
index dc018266c..35cde07ed 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
@@ -180,6 +180,7 @@ public class DistributionParcelListController extends BladeController  {
 	@ApiOperation(value = "分页", notes = "传入distributionParcelList")
 	public R<IPage<DistributionParcelListVO>> page(DistributionParcelListVO distributionParcelList, Query query) {
 		IPage<DistributionParcelListVO> pages = distributionParcelListService.selectDistributionParcelListPage(Condition.getPage(query), distributionParcelList);
+
 		return R.data(DistributionParcelListVOWrapper.build().pageVO(pages));
 	}
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 2c882109e..52a2d48f8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -962,6 +962,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										BladeUser user = AuthUtil.getUser();
 //										loadscanEntity.setScanUser(user.getUserName());
 										loadscanEntity.setScanUser(user.getNickName());
+										loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
+										loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
 										loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
 										loadscanEntity.setOneClick(1);
 										loadscanEntity.setScanType("2");