From 47ae383c916a05d61e1386fccb00dd8590f72cdc Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Wed, 20 Sep 2023 17:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AF=B9=E6=A2=A6=E5=A4=A9?=
 =?UTF-8?q?=E8=BD=AC=E8=BF=90=E4=BB=93=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java     |  8 --------
 .../mt/service/impl/MtFactoryDataServiceImpl.java     | 11 +++++++++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 49574c7fd..523db457b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -28,9 +28,7 @@ import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
 import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
-import com.logpm.basicdata.feign.IBasicdataCarrierClient;
 import com.logpm.basicdata.feign.IBasicdataDriverArteryClient;
-import com.logpm.basicdata.feign.IBasicdataVehicleClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.*;
@@ -76,7 +74,6 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -111,7 +108,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final IDistributionReservationStocklistService distributionReservationStocklistService;
 	private final IDistributionReservationPackageService distributionReservationPackageService;
 	private final DistributionReservationPackageMapper distributionReservationPackageMapper;
-	private final DistributionParcelListMapper distributionParcelListMapper;
 	private final IDistributionParcelListService distributionParcelListService;
 	private final DistributionLoadscanMapper distributionLoadscanMapper;
 	private final DistributionLoadscanServiceImpl distributionLoadscanService;
@@ -131,10 +127,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionReservationStockarticleMapper distributionReservationStockarticleMapper;
 	private final DistributionStockupMapper distributionStockupMapper;
 	private final IDistributionStockupInfoService distributionStockupInfoService;
-	private final DistributionStockupInfoMapper distributionStockupInfoMapper;
 	private final DistributionStockMapper distributionStockMapper;
 	private final DistributionLoadscaninvnMapper distributionLoadscaninvnMapper;
-	private final BladeRedis bladeRedis;
 	private final IDistributionAsyncService distributionAsyncService;
 	private final IDictBizClient dictBizClient;
 	private final IBasicdataDriverArteryClient iBasicdataDriverArteryClient;
@@ -143,8 +137,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionStockListMapper distributionStockListMapper;
 	private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
 	private final IBasicPrintTemplateClient basicPrintTemplateClient;
-	private final IBasicdataVehicleClient basicdataVehicleClient;
-	private final IBasicdataCarrierClient basicdataCarrierClient;
 
 	@Override
 	public IPage<DistributionDeliveryListEntity> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListEntity> page, DistributionDeliveryListDTO distributionDeliveryList) {
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
index ae25e3b89..748016f19 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
@@ -493,6 +493,12 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 				logger.info("#############sendReceiveInfo: 未找到对应订单mainId={}", mainId);
 				continue;
 			}
+			// 需要判断本次任务是否为中心仓的订单
+			if("转运仓".equals(mtFactoryOrderMain.getWarehouseType())){
+				// 转运仓的订单和签收不进行推送
+				logger.info("############# 转运仓的数据不进行推送 mtFactoryOrderMain={}", mtFactoryOrderMain);
+				continue;
+			}
 
 			MtReceiveContentDTO mtReceiveContentDTO = new MtReceiveContentDTO();
 			mtReceiveContentDTO.setInvoiceOrderCode(mtFactoryOrderMain.getInvoiceOrderCode());
@@ -504,14 +510,15 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 			mtReceiveContentDTOList.add(mtReceiveContentDTO);
 
 		}
-		logger.info("#############sendReceiveInfo:tag{}", 10);
+		logger.info("#############mtReceiveContentDTOList: size {}", mtReceiveContentDTOList.size());
 
-		if(mtReceiveContentDTOList.size()==0){
+		if(mtReceiveContentDTOList.isEmpty()){
 			logger.info("############# 没有找到需要配推送的订单包件");
 
 			return R.success("");
 		}
 
+
 		//签收信息数据存入头部数据
 		mtReceiveDTO.setReceiveContentList(mtReceiveContentDTOList);