Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -6433,17 +6433,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).eq(DistributionLoadscanEntity::getReservationId, reservationId)
 			.eq(DistributionLoadscanEntity::getPackageId, orderPackageId)
 			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
-		log.info("滞留取消任务条数", row);
+		log.info("滞留取消任务条数:{}", row);
 
 		if (row == 1) {
 			//存在计划
 
 			//进行了一条包件任务的取消，此时就应该对预约、配送任务进行数量的维护
 			distributionAsyncService.checkRetentionReservationAndDeliveryInfo(reservationId, deliveryId);
-		} else {
+		}
+
 			//包件未预约   处于异常驳回状态
 			//查询异常信息，对异常信息进行清理
-			log.info("滞留查询审核列表信息", row);
+			log.info("滞留查询审核列表信息:{}", row);
 
 			DistributionLoadscanAbnormalEntity abnormalEntity = distributionLoadscanAbnormalService.getOne(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 				.eq(DistributionLoadscanAbnormalEntity::getPackageId, orderPackageId)
@@ -6458,7 +6459,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				log.error(">>>>>>>>>>>>>>>查询异常信息错误:{}",orderPackageId);
 			}
 			//查询出多个包件信息
-		}
+
 		if (Func.isNotEmpty(loadscanEntity)) {
 			//修改包件状态  达到回库的状态
 			DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(loadscanEntity.getPackageId());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml

@@ -15,7 +15,7 @@
         select lta.*,
                lbc.client_name htMallName
         from logpm_trunkline_advance lta
-        left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name and lbtm.brand_name = lta.brand and IFNULL(lta.dealer_code,'') = IFNULL(lbtm.tripartite_coding,'') and lbtm.is_deletd = 0
+        left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name and lbtm.brand_name = lta.brand and IFNULL(lta.dealer_code,'') = IFNULL(lbtm.tripartite_coding,'') and lbtm.is_deleted = 0
         left join logpm_basicdata_client lbc on lbc.id = lbtm.client_id
         where lta.is_deleted = 0
           and lta.waybill_status = 0