From 8ad4130a219ac95dee75f381f27c6a27331bc8d6 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Tue, 19 Nov 2024 15:39:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=88=91=E4=B9=90=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 我乐订单数据排除删除标识的数据到暂存单
---
 .../olo/service/impl/DeliveryNoteServiceImpl.java          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 44fb95ee1..20b671209 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,8 +115,11 @@ 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(), "包车")) {
+			// 我乐包车和快递数据不进入暂存单 排除掉删除的数据
+			if (StrUtil.equals(detail.getShipmentTypeDesc(), "快递")
+				|| StrUtil.equals(detail.getShipmentTypeDesc(), "包车")
+				|| StrUtil.equals(detail.getFlag(), "D")
+			) {
 				continue;
 			}
 			String crmSo = detail.getCrmSo();