From b58139b7d56a7bf0a8d0d4415284abb01f80334b Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 12 Nov 2024 14:38:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistrilbutionBillLadingMapper.xml      |  4 +++-
 .../impl/DistrilbutionBillLadingServiceImpl.java  | 15 ++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index a4dd0aee2..5f9727d8b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -41,6 +41,7 @@
         t.customerName,
         t.customerTelephone,
         t.waybillNumber,
+        t.brand,
         3 AS typeService,
         t.warehouseEntryTime,
         t.storageFee,
@@ -107,7 +108,8 @@
         IF(k.customerTelephone is not null, k.customerTelephone, m.customerTelephone) AS customerTelephone,
         CONCAT_WS( ',', k.waybillNumber ) AS waybillNumber,
         k.warehouse_entry_time AS warehouseEntryTime,
-        k.storage_fee AS storageFee
+        k.storage_fee AS storageFee,
+        k.brand
         FROM
         (
         SELECT
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 2d7f265a2..76e67a810 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -2558,22 +2558,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		distrilbutionBillLadingDTO.setPickupBatchs(strs);
 		distrilbutionBillLadingDTO.setOrderCodes(orderCodes);
 		//获取当前登录人仓库
-		List<BasicdataWarehouseEntity> warehouseList = basicdataWarehouseClient.getMyWarehouseList();
-		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = null;
 
-		List<Long> collect = null;
+		List<Long> collect = basicdataWarehouseClient.getWarehouseIds();
 
-		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = null;
-		if (Func.isNotEmpty(myCurrentWarehouse)) {
-			collect = new ArrayList<>();
-			collect.add(myCurrentWarehouse.getId());
 
-		} else {
-//			distrilbutionBillLadingVOIPage = baseMapper.getAllBillLadingByView(page, distrilbutionBillLadingDTO, collect);
-			collect = warehouseList.stream()
-				.map(BasicdataWarehouseEntity::getId)
-				.collect(Collectors.toList());
-		}
 		distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);