diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 74d3f9716..1689d8f3d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -174,7 +174,7 @@
                 and ldpl.stock_article_id like concat('%',#{param.stockArticleId},'%')
             </if>
             <if test="param.orderCode !='' and param.orderCode != null">
-                and ldpl.order_code like concat('%',#{param.orderCode},'%')
+                and ldpl.order_code like concat(#{param.orderCode},'%')
             </if>
             <if test="param.serviceNumber !='' and param.serviceNumber != null">
                 and ldpl.service_number like concat('%',#{param.serviceNumber},'%')
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index f3b6496df..c9992cf40 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -147,10 +147,18 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 	@Override
 	public IPage<DistributionParcelListVO> selectDistributionParcelListPage(IPage<DistributionParcelListVO> page, DistributionParcelListVO distributionParcelList) {
-		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
-		List<Long> collect = myWatchWarehouse.stream()
-			.map(BasicdataWarehouseEntity::getId)
-			.collect(Collectors.toList());
+		BasicdataWarehouseEntity myWatchWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		List<Long> collect = new ArrayList<>();
+		if(ObjectUtils.isNull(myWatchWarehouse)){
+			List<BasicdataWarehouseEntity> myWatchWarehouse1 = basicdataWarehouseClient.getMyWatchWarehouse();
+			myWatchWarehouse1.forEach(t->{
+				collect.add(t.getId());
+			});
+
+		}else{
+			collect.add(myWatchWarehouse.getId());
+		}
+
 		distributionParcelList.setWarehouseIdList(collect);
 		List<DistributionParcelListVO> distributionParcelListEntities = baseMapper.selectDistributionParcelListPage(page, distributionParcelList);
 		return page.setRecords(distributionParcelListEntities);
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 12531b4d9..aa1164d68 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
@@ -306,7 +306,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 					parcelNumberEntity.setCreateUser(distributionStockArticleEntity.getCreateUser());
 					parcelNumberEntity.setUpdateUser(distributionStockArticleEntity.getCreateUser());
 					parcelNumberEntity.setCreateDept(distributionStockArticleEntity.getCreateDept());
-					parcelNumberEntity.setHandQuantity(0);
+					// 目前的解决方案
+					parcelNumberEntity.setHandQuantity(entity.getQuantity());
 					parcelNumberEntity.setQuantity(entity.getQuantity());
 					parcelNumberEntity.setDeliveryQuantity(0);
 					parcelNumberEntity.setSigninQuantity(0);