1.修复商家端数据重复问题

2.修改站存单信息查询因为结算品类维护导致数据重复问题

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";
 
 	/**
 	 * 工厂对接服务名称

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);
 

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(DISTINCT waybill_number) as waybill_number,
-        GROUP_CONCAT(order_code) as order_code,
+        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,

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.*;
-import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
 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<>();

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) {
+	public List<TrunklineAdvanceDetailEntity> findListByAdvanceIds(List<Long> collect) {
-		return advanceDetailService.findAdvanceDetailVoByAdvanceIds(collect);
+		LambdaQueryWrapper<TrunklineAdvanceDetailEntity> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(TrunklineAdvanceDetailEntity::getAdvanceId,collect);
+		List<TrunklineAdvanceDetailEntity> list = advanceDetailService.list(queryWrapper);
+
+		return list;
 	}
 
 	@Override

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)

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 删除该租户下基于运单号的相关数

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(">>> 执行保存数据到商家数据的功能 ");
 		// 保存暂存单