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> 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();