diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
index d558ff578..f6fae33d5 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
@@ -67,7 +67,7 @@ public interface IDistributionParcelListClient {
 	List<DistributionParcelListEntity> findEntityListByOrderCode(@RequestParam String orderCode);
 
 	@GetMapping(API_PREFIX+"/findALLNoUpShelfPackageByOrderCode")
-    List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(@RequestParam String orderCode);
+    List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(@RequestParam String orderCode,@RequestParam Long warehouseId);
 
 	@GetMapping(API_PREFIX+"/updatePackageGroundingStatus")
 	void updatePackageGroundingStatus(@RequestParam String orderPackageCode, @RequestParam String groundingStatus);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
index 102c0b02f..c56c191d4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
@@ -89,12 +89,12 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	}
 
 	@Override
-	public List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(String orderCode) {
+	public List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(String orderCode,Long warehouseId) {
 //    	QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
 //    	queryWrapper.eq("order_code",orderCode)
 //			.eq("is_deleted",0)
 //			.eq("order_package_grounding_status",10);
-		return distributionParcelListService.findALLNoUpShelfPackageByOrderCode(orderCode);
+		return distributionParcelListService.findALLNoUpShelfPackageByOrderCode(orderCode,warehouseId);
 	}
 
 	@Override
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
index 26e74dd4a..5692ff324 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
@@ -90,7 +90,7 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	 */
     List<PackageStockupVO> selectOrderInfoSelfList(@Param("reservationId") Long reservationId,@Param("stockupId") Long stockupId, @Param("stockArticleId")Long stockArticleId);
 
-    List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode);
+    List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode,@Param("orderCode") Long warehouseId);
 
     IPage<DistributionParcelListEntity> pageOweList(IPage<Object> page,@Param("param") DistributionParcelListDTO parcelListEntity);
 }
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 a165abc97..5c8401b20 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
@@ -318,6 +318,7 @@
         left join logpm_warehouse_updown_goods lwug on lwug.association_value = ldpl.order_package_code
         where 1=1
         and ldpl.order_code = #{orderCode}
+        and ldpl.warehouse_id = #{warehouseId}
         and lwtg.id is null
         and lwug.id is null
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 4cc1a4f4e..11b49a0b9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -300,11 +300,12 @@
     <select id="fingListByServiceNumber" resultType="java.util.Map">
         select ldsa.service_number serviceNum,
                ldsa.order_code orderCode,
+               1 goodsType,
                ldsa.total_number num,
                ldsa.complete_set completeSet
         from logpm_distribution_stock_article ldsa
         where ldsa.is_deleted = 0
-          and ldsa.genre == 1
+          and ldsa.genre = 1
         and ldsa.service_number = #{serviceNumber}
     </select>
     <select id="pageListOwe" parameterType="com.logpm.distribution.dto.DistributionStockArticleOweDTO" resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
index f13f449f8..e33128cfa 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
@@ -99,7 +99,7 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 */
 	List<PackageStockupVO> selectOrderInfoSelfList(Long reservationId, Long stockArticleId, Long stockupId, Long trayId);
 
-    List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(String orderCode);
+    List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(String orderCode,Long warehouseId);
 
     IPage<DistributionParcelListEntity> pageOweList(IPage<Object> page,Map<String, Object> distributionParcelList);
 }
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 1fe6d1162..22c2b6b5e 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
@@ -188,8 +188,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	}
 
 	@Override
-	public List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(String orderCode) {
-		return baseMapper.findALLNoUpShelfPackageByOrderCode(orderCode);
+	public List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(String orderCode,Long warehouseId) {
+		return baseMapper.findALLNoUpShelfPackageByOrderCode(orderCode,warehouseId);
 	}
 
 	@Override
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 95e1aa560..0f219908b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -157,6 +157,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				upShelfDataVO.setOrderCode((String) map.get("orderCode"));
 				upShelfDataVO.setTotalNum((Integer) map.get("num"));
 				upShelfDataVO.setCompleteSet((Integer) map.get("completeSet"));
+				upShelfDataVO.setGoodsType((Integer) map.get("goodsType"));
 				list.add(upShelfDataVO);
 			}
 
@@ -191,6 +192,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			dataVO.setOrderCode(stockArticleEntity.getOrderCode());
 			dataVO.setTotalNum(stockArticleEntity.getTotalNumber());
 			dataVO.setCompleteSet(stockArticleEntity.getCompleteSet());
+			dataVO.setGoodsType(1);
 			ls.add(dataVO);
 			return ls;
 		}else if(upshelfScanType == 3){
@@ -242,6 +244,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			UpShelfDataVO dataVO = new UpShelfDataVO();
 			dataVO.setOrderCode(parcelListEntity.getOrderCode());
 			dataVO.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
+			dataVO.setTotalNum(1);
+			dataVO.setGoodsType(0);
 			ls.add(dataVO);
 			return ls;
 		}else if(upshelfScanType == 4){
@@ -520,7 +524,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				continue;
 			}
 			//查询所有该订单号未上架的数据
-			List<DistributionParcelListEntity> parcelListList = distributionParcelListClient.findALLNoUpShelfPackageByOrderCode(orderCode);
+			List<DistributionParcelListEntity> parcelListList = distributionParcelListClient.findALLNoUpShelfPackageByOrderCode(orderCode,warehouseId);
 			for (DistributionParcelListEntity parcelListEntity:parcelListList){
 				try{
 					String orderPackageCode = parcelListEntity.getOrderPackageCode();