From 120de77af354d4d9b805beb3b761e4840817771e Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 25 Oct 2024 15:40:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=88=91?=
 =?UTF-8?q?=E4=B9=90=E5=B7=A5=E5=8E=82=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加我乐工厂数据快递和包车的订单过滤掉，不进入暂存单
---
 .../factorydata/olo/service/impl/DeliveryNoteServiceImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
index 40bcec87d..00327a75a 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
@@ -115,6 +115,10 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		Map<String, List<DeliveryNoteEntity>> advanceMap = new HashMap<>();
 		// 车次号 + 订单自编号 一个暂存单
 		for (DeliveryNoteEntity detail : vos) {
+			// 我乐包车和快递数据不进入暂存单
+			if(StrUtil.equals(detail.getShipmentTypeDesc(), "快递") || StrUtil.equals(detail.getShipmentTypeDesc(), "包车")){
+				continue;
+			}
 			String crmSo = detail.getCrmSo();
 			String shipmentNumber = detail.getShipmentNo();
 			String advanceKey = crmSo + shipmentNumber;