Merge branch 'dev' into pre-production

blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java

@@ -31,6 +31,7 @@ import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient;
 import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import com.logpm.warehouse.vo.TrayTypeDataVO;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.Nullable;
 import org.springblade.common.annotations.ChangeAsync;
 import org.springblade.common.constant.IncomingTypeEnum;
@@ -52,6 +53,7 @@ import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
+@Slf4j
 public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrderMapper, BusinessPreOrderEntity> implements IBusinessPreOrderService {
 
 
@@ -407,6 +409,8 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 
 		BusinessPreOrderEntity selectD = null;
 		// 检查包件是否入库
+		log.info("list:{}", list);
+		log.info("orderPackageCode:{}", orderPackageCode);
 		for (BusinessPreOrderEntity distributionBusinessPreOrderEntity : list) {
 
 			if (distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode)) {
@@ -415,6 +419,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 				break;
 			}
 		}
+		log.info("selectD1:{}", selectD);
 		// 全仓查询
 		if (selectD == null) {
 			LambdaQueryWrapper<BusinessPreOrderEntity> queryWrapper2 = new LambdaQueryWrapper<>();
@@ -437,7 +442,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 
 			}
 		}
-
+		log.info("selectD2:{}", selectD);
 		if (selectD == null) {
 			// 暂存单查询
 			TrunklineAdvanceDetailEntity entityByOrderPackageCode = trunklineAdvanceDetailClient.findEntityByOrderPackageCode(orderPackageCode);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java

@@ -61,13 +61,18 @@ public class ExtractedDataClient implements IExtractedDataClient {
 
 		List<WarehouseWayBillDetail> warehouseWayBillDetails = warehouseWaybillDetailClient.findByWaybillId(byWaybillNo.getId());
 
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>warehouseWayBillDetails ：{}", warehouseWayBillDetails);
+
 		List<TrunklineWaybillOrderEntity> trunklineWaybillOrderEntities = trunklineWaybillOrderClient.findListByWaybillNo(byWaybillNo.getWaybillNo());
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>trunklineWaybillOrderEntities ：{}", trunklineWaybillOrderEntities);
 
 		List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities = trunklineWaybillPackageClient.findListByWaybillIds(waybillIds);
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>trunklineWaybillPackageEntities ：{}", trunklineWaybillPackageEntities);
 
 		// 暂存单ID集合
 		List<Long> collect = trunklineWaybillOrderEntities.stream().map(TrunklineWaybillOrderEntity::getAdvanceId).distinct().collect(Collectors.toList());
-		if(!collect.isEmpty()){
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>collect {}>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", collect);
+		if (!collect.isEmpty()) {
 			List<TrunklineAdvanceEntity> trunklineAdvanceEntities = trunklineAdvanceClient.findListByIds(collect);
 			List<TrunklineAdvanceDetailVO> trunklineAdvanceDetailEntities = trunklineAdvanceDetailClient.findListByAdvanceIds(collect);
 			// 获取暂存单明细
@@ -78,12 +83,12 @@ public class ExtractedDataClient implements IExtractedDataClient {
 			List<TrunklineWaybillTrackEntity> list = trunklineWaybillTrackService.list(queryWrapper);
 			TrunklineWaybillTrackEntity trunklineWaybillTrackEntity = list.get(0);
 			CompletableFuture.supplyAsync(() -> {
+				log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>推送商家端运单 站存单  暂存单明细>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
 				asyncService.saveOtherData(tenantId, byWaybillNo, trunklineAdvanceDetailEntities, trunklineAdvanceEntities, trunklineWaybillPackageEntities, trunklineWaybillOrderEntities, warehouseWayBillDetails, trunklineWaybillTrackEntity);
 				return null;
 			});
 		}
 
 
-
 	}
 }