From fd50ee1dda04289f3716bfd67d512e08e59e08b1 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 5 Dec 2024 16:26:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=95=86=E5=AE=B6=E7=AB=AF?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=99=E5=AD=98=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9B=A0=E4=B8=BA=E7=BB=93=E7=AE=97=E5=93=81?=
 =?UTF-8?q?=E7=B1=BB=E7=BB=B4=E6=8A=A4=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/common/constant/ModuleNameConstant.java  | 2 +-
 .../trunkline/feign/ITrunklineAdvanceDetailClient.java   | 2 +-
 .../com/logpm/business/mapper/BusinessPreOrderMapper.xml | 4 ++--
 .../com/logpm/trunkline/feign/ExtractedDataClient.java   | 7 ++-----
 .../trunkline/feign/TrunklineAdvanceDetailClient.java    | 9 +++++++--
 .../trunkline/mapper/TrunklineAdvanceDetailMapper.xml    | 2 +-
 .../java/com/logpm/trunkline/service/IAsyncService.java  | 2 +-
 .../logpm/trunkline/service/impl/AsyncServiceImpl.java   | 2 +-
 8 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
index ff9f81986..13dc1795b 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
@@ -9,7 +9,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="";
+	public static final String DEVAUTH ="-pref";
 
 	/**
 	 * 工厂对接服务名称
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java
index 224785d3e..a0b30c01e 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java
@@ -22,7 +22,7 @@ public interface ITrunklineAdvanceDetailClient {
 	void addAdvanceBatch(@RequestBody List<TrunklineAdvanceDetailEntity> advanceDetailEntities);
 
 	@PostMapping(API_PREFIX+"/findListByAdvanceIds")
-	List<TrunklineAdvanceDetailVO> findListByAdvanceIds(@RequestBody List<Long> collect);
+	List<TrunklineAdvanceDetailEntity> findListByAdvanceIds(@RequestBody List<Long> collect);
 	@GetMapping(API_PREFIX+"/findEntityByOrderPackageCode")
 	TrunklineAdvanceDetailEntity findEntityByOrderPackageCode(@RequestParam String orderPackageCode);
 
diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
index 8661447e3..b2d6b3383 100644
--- a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
+++ b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
@@ -167,8 +167,8 @@
     <select id="pageByCarNum" resultType="com.logpm.business.vo.DistributionBusinessPreCarNumberVO">
 
         SELECT distr_car_number,
-        GROUP_CONCAT(waybill_number) as waybill_number,
-        GROUP_CONCAT(order_code) as order_code,
+        GROUP_CONCAT(DISTINCT waybill_number) as waybill_number,
+        GROUP_CONCAT(DISTINCT order_code) as order_code,
         GROUP_CONCAT(DISTINCT driver_name) as driver_name,
         sum(quantity) as totalNum,
         sum(unload_num) as inNum,
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java
index 7371e88ef..8d41b086b 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java
@@ -1,10 +1,7 @@
 package com.logpm.trunkline.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
+import com.logpm.trunkline.entity.*;
 import com.logpm.trunkline.service.IAsyncService;
 import com.logpm.trunkline.service.ITrunklineWaybillTrackService;
 import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
@@ -74,7 +71,7 @@ public class ExtractedDataClient implements IExtractedDataClient {
 		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>collect {}>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", collect);
 		if (!collect.isEmpty()) {
 			List<TrunklineAdvanceEntity> trunklineAdvanceEntities = trunklineAdvanceClient.findListByIds(collect);
-			List<TrunklineAdvanceDetailVO> trunklineAdvanceDetailEntities = trunklineAdvanceDetailClient.findListByAdvanceIds(collect);
+			List<TrunklineAdvanceDetailEntity> trunklineAdvanceDetailEntities = trunklineAdvanceDetailClient.findListByAdvanceIds(collect);
 			// 获取暂存单明细
 
 			LambdaQueryWrapper<TrunklineWaybillTrackEntity> queryWrapper = new LambdaQueryWrapper<>();
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java
index d7b673c4a..381f99d7a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java
@@ -1,5 +1,6 @@
 package com.logpm.trunkline.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
@@ -27,8 +28,12 @@ public class TrunklineAdvanceDetailClient implements ITrunklineAdvanceDetailClie
 	}
 
 	@Override
-	public List<TrunklineAdvanceDetailVO> findListByAdvanceIds(List<Long> collect) {
-		return advanceDetailService.findAdvanceDetailVoByAdvanceIds(collect);
+	public List<TrunklineAdvanceDetailEntity> findListByAdvanceIds(List<Long> collect) {
+		LambdaQueryWrapper<TrunklineAdvanceDetailEntity> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(TrunklineAdvanceDetailEntity::getAdvanceId,collect);
+		List<TrunklineAdvanceDetailEntity> list = advanceDetailService.list(queryWrapper);
+
+		return list;
 	}
 
 	@Override
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
index f1ca96c59..f6ff2b592 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
@@ -484,7 +484,7 @@
                IFNULL(lbc.name,'其他') goodsName,
                ltad.*
         from 	logpm_trunkline_advance_detail ltad
-        LEFT JOIN logpm_basicdata_factory_category lbfc ON lbfc.brand = ltad.brand
+        LEFT JOIN logpm_basicdata_factory_category lbfc ON lbfc.brand = ltad.brand and  lbfc.type = '1'
         AND IFNULL(lbfc.firsts,1) = IFNULL(ltad.first_pack_name,1)
         AND IFNULL(lbfc.seconds,2) = IFNULL(ltad.second_pack_name,2)
         AND IFNULL(lbfc.thirds,3) = IFNULL(ltad.third_pack_name,3)
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IAsyncService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IAsyncService.java
index 04ab83d9c..4f4127cd5 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IAsyncService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IAsyncService.java
@@ -19,7 +19,7 @@ public interface IAsyncService {
 	CompletableFuture<Boolean> updateAdvanceEntity(List<TrunklineAdvanceEntity> list, int queryType);
 
 
-	void saveOtherData(String tenantId,WarehouseWaybillEntity byWaybillId, List<TrunklineAdvanceDetailVO> trunklineAdvanceDetailEntities, List<TrunklineAdvanceEntity> trunklineAdvanceEntities, List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities, List<TrunklineWaybillOrderEntity> trunklineWaybillOrderEntities, List<WarehouseWayBillDetail> warehouseWayBillDetails, TrunklineWaybillTrackEntity trunklineWaybillTrackEntity );
+	void saveOtherData(String tenantId,WarehouseWaybillEntity byWaybillId, List<TrunklineAdvanceDetailEntity> trunklineAdvanceDetailEntities, List<TrunklineAdvanceEntity> trunklineAdvanceEntities, List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities, List<TrunklineWaybillOrderEntity> trunklineWaybillOrderEntities, List<WarehouseWayBillDetail> warehouseWayBillDetails, TrunklineWaybillTrackEntity trunklineWaybillTrackEntity );
 
 	/**
 	 * 根据租户ID 删除该租户下基于运单号的相关数
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/AsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/AsyncServiceImpl.java
index 4dd7d46fc..ece452d67 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/AsyncServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/AsyncServiceImpl.java
@@ -85,7 +85,7 @@ public class AsyncServiceImpl implements IAsyncService {
 
 	@ChangeAsync()
 	@Override
-	public void saveOtherData(String tenantId, WarehouseWaybillEntity waybillBilllByWaybillNo, List<TrunklineAdvanceDetailVO> trunklineAdvanceDetailEntities, List<TrunklineAdvanceEntity> trunklineAdvanceEntities, List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities, List<TrunklineWaybillOrderEntity> trunklineWaybillOrderEntities, List<WarehouseWayBillDetail> warehouseWayBillDetails, TrunklineWaybillTrackEntity trunklineWaybillTrackEntity) {
+	public void saveOtherData(String tenantId, WarehouseWaybillEntity waybillBilllByWaybillNo, List<TrunklineAdvanceDetailEntity> trunklineAdvanceDetailEntities, List<TrunklineAdvanceEntity> trunklineAdvanceEntities, List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities, List<TrunklineWaybillOrderEntity> trunklineWaybillOrderEntities, List<WarehouseWayBillDetail> warehouseWayBillDetails, TrunklineWaybillTrackEntity trunklineWaybillTrackEntity) {
 
 		log.info(">>> 执行保存数据到商家数据的功能 ");
 		// 保存暂存单