diff --git a/blade-service/logpm-distribution/src/main/resources/application-prod.yml b/blade-service/logpm-distribution/src/main/resources/application-prod.yml
index 3dd1b224d..94d36fb66 100644
--- a/blade-service/logpm-distribution/src/main/resources/application-prod.yml
+++ b/blade-service/logpm-distribution/src/main/resources/application-prod.yml
@@ -29,3 +29,29 @@ spring:
           url: ${blade.datasource.distribution.slave.url}
           username: ${blade.datasource.distribution.slave.username}
           password: ${blade.datasource.distribution.slave.password}
+  #rabbitmq配置
+  rabbitmq:
+    host: 172.16.128.146
+    port: 5672
+    username: admin
+    password: Slwk@123654
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /
+    #确认消息已发送到队列(Queue)
+    publisher-returns: true
+    publisher-confirm-type: correlated
+    # 手动提交消息
+    listener:
+      simple:
+        acknowledge-mode: auto
+        default-requeue-rejected: false
+        retry:
+          enabled: true # 开启消费者失败重试
+          initial-interval: 1000 # 初识的失败等待时长为1秒
+          multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval
+          max-attempts: 3 # 最大重试次数
+          stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false
+      direct:
+        acknowledge-mode: manual
+    template:
+      mandatory: true
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
index 3689f571b..659c8a8e9 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
@@ -170,11 +170,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			distributionStockArticleEntity.setServiceNumber(warehouseWaybill.getServiceNo());
 			distributionStockArticleEntity.setWaybillNumber(waybillNo);
 			distributionStockArticleEntity.setWaybillId(warehouseWaybill.getId());
-			distributionStockArticleEntity.setWarehouseId(warehouseWaybill.getId());
+			distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId());
 			distributionStockArticleEntity.setMallName(warehouseWaybill.getConsigneeName());
 			distributionStockArticleEntity.setMallId(warehouseWaybill.getConsigneeId());
 			distributionStockArticleEntity.setDescriptionGoods(warehouseWaybill.getGoodsName());
-			distributionStockArticleEntity.setWarehouse(warehouseWaybill.getDepartureWarehouseName());
+			distributionStockArticleEntity.setWarehouse(basicdataWarehouseEntity.getName());
 			distributionStockArticleEntity.setWarehouseEntryTime(date);
 			distributionStockArticleEntity.setTotalNumber(totalCount);
 			distributionStockArticleEntity.setHandQuantity(totalCount);
@@ -235,7 +235,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			DistributionParcelListEntity entity = new DistributionParcelListEntity();
 			entity.setMaterialName(warehouseWayBillDetail.getProductName());
 			entity.setQuantity(warehouseWayBillDetail.getNum());
-			entity.setConditions(1);
+			entity.setConditions(3);
 			entity.setStockArticleId(id);
 			ls.add(entity);
 		}
@@ -244,6 +244,14 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			log.warn("#################createStockArticle: 保存包件信息失败  orderSelfNum={}", waybillNo);
 			throw new CustomerException(405, "保存包件信息失败");
 		}
+		// 判断运单的货物是否齐套
+		// todo 目前这里无法判断零担货物是否齐套  默认已到期
+
+
+
+
+
+
 	}