From 6dfd7912fbc6e4a29bc4acba6394c9624ad7355a Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 3 Apr 2024 22:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A2=9E=E5=8A=A0=E4=BB=93?=
=?UTF-8?q?=E5=BA=93=E9=80=89=E6=8B=A9=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../distribution/mapper/DistrilbutionBillLadingMapper.xml | 3 +++
.../service/impl/DistrilbutionBillLadingServiceImpl.java | 5 +++++
2 files changed, 8 insertions(+)
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 c1b55e95c..13f078554 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
@@ -144,6 +144,9 @@
and dbl.certificate_type =
#{param.certificateType}
+ and dbl.warehouse_id =
+ #{param.warehouseId}
+
GROUP BY dbl.id,dsa.warehouse,dsa.type_service
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 ed5ce8062..60ca6dada 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
@@ -1427,7 +1427,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl collect = myWatchWarehouse.stream()
.map(BasicdataWarehouseEntity::getId)
.collect(Collectors.toList());
+ BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
distrilbutionBillLadingDTO.setWarehouseIdList(collect);
+ if (Func.isNotEmpty(myWatchWarehouse)){
+ distrilbutionBillLadingDTO.setWarehouseIdList(null);
+ distrilbutionBillLadingDTO.setWarehouseId(myCurrentWarehouse.getId());
+ }
IPage distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO);
List records = distrilbutionBillLadingVOIPage.getRecords();
records.forEach(i -> {