feat(all): 曼好家工厂

1 修改曼好家工厂订单号+交割单号唯一

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<DeliveryNoteEntity> list = deliveryNoteService.list(Wrappers.<DeliveryNoteEntity>lambdaQuery()
+			.eq(DeliveryNoteEntity::getOrderNo, vo.getOrderNo())
 			.eq(DeliveryNoteEntity::getOrderSelfNum, orderSelfNum));
 		if (CollUtil.isNotEmpty(list)) {
 			log.error("订单号{} 数据已经处理过了, logId: {}", orderSelfNum, logId);

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<DeliveryNoteMapper,
 			advanceEntity.setSenderPhone(vo.getSender().getSenderMobile());
 			advanceEntity.setSenderAddress(vo.getSender().getSenderAddress());
 		}
-		advanceEntity.setTrainNumber("");
+		advanceEntity.setTrainNumber(vo.getOrderNo());
 		advanceEntity.setSenderFactory(BrandEnums.MHJ.getValue());
 		advanceEntity.setOrderCode(vo.getOrderSelfNum());
 		advanceEntity.setDealerCode(vo.getStoreCode());
@@ -137,7 +137,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 					advanceDetailEntity.setSiteCode("");
 					advanceDetailEntity.setQuantity(1);
 					advanceDetailEntity.setOrderPackageCode(code);
-					advanceDetailEntity.setTrainNumber("");
+					advanceDetailEntity.setTrainNumber(vo.getOrderNo());
 					advanceDetailEntity.setServiceNum(vo.getOrderNo());
 					advanceDetailEntity.setWaybillNo("");
 					advanceDetailEntity.setPackageStatus("0");