diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/mq/FactoryOrderListener.java b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/mq/FactoryOrderListener.java index fb4bc181c..e1edf47b1 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/mq/FactoryOrderListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/mq/FactoryOrderListener.java @@ -90,9 +90,10 @@ public class FactoryOrderListener { return; } // 1 解析数据保存入库 - // 订单号唯一 + // 交割单 + 订单号唯一 String orderSelfNum = vo.getOrderSelfNum(); List list = deliveryNoteService.list(Wrappers.lambdaQuery() + .eq(DeliveryNoteEntity::getOrderNo, vo.getOrderNo()) .eq(DeliveryNoteEntity::getOrderSelfNum, orderSelfNum)); if (CollUtil.isNotEmpty(list)) { log.error("订单号{} 数据已经处理过了, logId: {}", orderSelfNum, logId); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java index f92ea6f3c..4e1d07d3d 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java @@ -98,7 +98,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl