From e2ef3af34fc4fb5bd39ce7accfdaef491210fc84 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 19 Apr 2024 14:15:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dfeign=20=E8=B5=B0?=
 =?UTF-8?q?=E4=BA=86master=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/excel/BasicdataFactoryCategoryImporter.java     | 1 +
 .../dto/DistributionStockArticleStatisticsDTO.java            | 2 +-
 .../mapper/DistributionStockArticleStatisticsMapper.xml       | 2 +-
 .../impl/DistributionStockArticleStatisticsServiceImpl.java   | 4 ++--
 .../com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java | 2 +-
 .../com/logpm/warehouse/feign/WarehouseWaybillClient.java     | 2 +-
 .../warehouse/feign/WarehouseWaybillReceivedRecordClient.java | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
index ee79bbc09..587965f67 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
@@ -41,6 +41,7 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 		LambdaQueryWrapper<BasicdataFactoryCategoryEntity> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper1.eq(BasicdataFactoryCategoryEntity::getIsDeleted, 0);
 		List<BasicdataFactoryCategoryEntity> allBasicdataFactoryCategoryEntities = basicdataFactoryCategoryService.list(lambdaQueryWrapper1);
+		//todo 这里的优化 是最好能进行品牌分组 获取对应的品牌数据 来进行匹配 这样可以减少循环次数
 
 
 		List<BasicdataFactoryCategoryEntity> basicdataFactoryCategoryEntities = new ArrayList<>();
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleStatisticsDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleStatisticsDTO.java
index f0fce8306..f1173720a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleStatisticsDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleStatisticsDTO.java
@@ -16,7 +16,7 @@ public class DistributionStockArticleStatisticsDTO {
 	/**
 	 * 运单总数
 	 */
-	private Long WaybillNum;
+	private Long waybillNum;
 
 	/**
 	 * 包件总数
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml
index 7de78c661..58e78fd06 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.logpm.distribution.mapper.DistributionStockArticleStatisticsMapper">
     <select id="collect" resultType="com.logpm.distribution.dto.DistributionStockArticleStatisticsDTO">
      select
-            count(distinct ldsa.waybill_id) WaybillNum,
+            count(distinct ldsa.waybill_id) waybillNum,
             count(distinct ldsa.order_code) orderNum,
             count(distinct ldpl.id) packageCodeNum
         from logpm_distribution_stock_article ldsa
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleStatisticsServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleStatisticsServiceImpl.java
index cbdec4339..d3be8b2b7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleStatisticsServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleStatisticsServiceImpl.java
@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public class DistributionStockArticleStatisticsServiceImpl implements IDistributionStockArticleStatisticsService {
 
-	private DistributionStockArticleStatisticsMapper  distributionStockArticleStatisticsMapper;
+	private final DistributionStockArticleStatisticsMapper distributionStockArticleStatisticsMapper;
 
-	private IBasicdataWarehouseClient warehouseClient;
+	private final IBasicdataWarehouseClient warehouseClient;
 
 	@Override
 	public DistributionStockArticleStatisticsDTO collect(DistributionStockArticleOweDTO distributionStockArticleOweDTO) {
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java
index d66e6a4da..ccfb4a6c8 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java
@@ -16,7 +16,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
-@NonDS
+//@NonDS
 @ApiIgnore
 @RestController
 @AllArgsConstructor
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java
index ef5c5596a..033c159cd 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java
@@ -15,7 +15,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
-@NonDS
+//@NonDS
 @ApiIgnore
 @RestController
 @AllArgsConstructor
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillReceivedRecordClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillReceivedRecordClient.java
index 05c4d9f4b..3e37c4566 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillReceivedRecordClient.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillReceivedRecordClient.java
@@ -31,7 +31,7 @@ import java.util.List;
  * @author zhy
  * @since 2023-07-28
  */
-@NonDS
+//@NonDS
 @ApiIgnore
 @RestController
 @AllArgsConstructor