diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java
index 3c41f3cf5..8f9556c17 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java
@@ -37,5 +37,6 @@ public class DistributionStockupOrderListVO implements Serializable {
 	private Long parcelListId; //包件id
 	private Long stockId; //备货id
 	private Long allocationId; //货位id
+	private Integer stockQuantity; //备货数量
 
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
index 6f9e6efa0..2450a70da 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
@@ -205,7 +205,7 @@ public class DistributionStockupAppController extends BladeController {
 			//自提
 			if (orderStatus.equals(1)) {
 				//查询备货区信息
-				DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupDetails(reservationId);
+				DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupDetails(reservationId,stockupDTO.getIsZero());
 				map = convertObjectToMap(distributionStockupSelfVO);
 				//客户订单
 				List<DistributionStockupOrderListVO> list = distributionStockupService.selectStockupOrderList(stockupDTO);
@@ -215,6 +215,10 @@ public class DistributionStockupAppController extends BladeController {
 					}
 					return true;
 				}).collect(Collectors.toList());
+				if(collect.isEmpty()){
+					map.put("planNum",0);
+					map.put("scanNum",0);
+				}
 				map.put("orderList", collect);
 			} else {
 				//查询备货区信息
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
index 6f7e8fa78..bcc24016f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
@@ -220,4 +220,11 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 * @return
 	 */
 	List<StockupZeroVO> getZeroStockUpDataMeiSelf(@Param("param") StockupZeroDTO stockupDTO);
+
+	/**
+	 * 查询零担数据预约数量
+	 * @param reservationId
+	 * @return
+	 */
+	DistributionStockupSelfVO selectStockupDetailsZero(Long reservationId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 0609d4112..4d06249ca 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -450,6 +450,20 @@
         GROUP BY lddd.stock_list_id,ldsl.description_goods,ldsl.sku,ldsl.cargo_norms,lddd.quantity,ldsl.cargo_unit,ldsl.tray_name,ldsl.unpack,lddd.id
 
     </select>
+    <select id="selectStockupDetailsZero" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
+        select lds.stockup_area  goodsAreaName,
+        (
+        select GROUP_CONCAT(DISTINCT ldsa.mall_name SEPARATOR ',')
+        from  logpm_distrilbution_bill_stock ldbs
+        LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id
+        where ldbs.bill_lading_id = ldsi.reservation_id
+        ) consignee, sum(ldrzp.quantity) planNum ,SUM(ldrzp.reality_quantity) scanNum
+        from logpm_distribution_stockup_info ldsi
+        LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
+        LEFT JOIN logpm_distribution_reservation_zero_package ldrzp on ldrzp.reservation_id = ldsi.reservation_id
+        where ldsi.reservation_id = #{reservationId}
+        GROUP BY lds.stockup_area
+    </select>
 
     <select id="selectStockupDetails" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
         select lds.stockup_area  goodsAreaName,
@@ -463,8 +477,8 @@
                    select COUNT(ldpl.id)
                    from  logpm_distrilbution_bill_stock ldbs
                              LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
-                   where ldbs.bill_lading_id = ldsi.reservation_id
-               ) planNum,(
+                   where ldbs.bill_lading_id = ldsi.reservation_id and ldpl.order_package_code is not null
+        ) planNum,(
             select COUNT(id)
             from logpm_distribution_stock
             where parcel_list_id in (
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
index ed0e85a02..98966a3ac 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
@@ -10,7 +10,7 @@
 
         from logpm_distrilbution_bill_stock ldbs
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
-        where ldbs.bill_lading_id = #{reservationId}
+        where ldbs.bill_lading_id = #{reservationId} and ldpl.order_package_code is NOT null
     </select>
 
     <select id="selectDistrilbutionBillStockPage" resultMap="distrilbutionBillStockResultMap">
@@ -172,7 +172,7 @@
                  LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwug.association_id
         where ldbs.bill_lading_id = #{reservationId} -->
         select  DISTINCT  CONCAT(  lwug.position_code ) allocation ,lwug.allocation_id allocationId ,  lwtg.tray_code pallet,lwtg.tray_id trayId,lwug.area_id areaId,
-        lwug.shelf_id shelfId,ldpl.order_code orderCode,ldpl.stock_article_id stockArticleId ,ldpl.id parcelListId,lds.id stockId
+        lwug.shelf_id shelfId,ldpl.order_code orderCode,ldpl.stock_article_id stockArticleId ,ldpl.id parcelListId,lds.id stockId,lds.stock_quantity stockQuantity
 
         from logpm_distrilbution_bill_stock ldbs
         LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationZeroPackageService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationZeroPackageService.java
index 2f7257a34..e47515673 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationZeroPackageService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationZeroPackageService.java
@@ -49,4 +49,10 @@ public interface IDistributionReservationZeroPackageService extends BaseService<
 	 */
 	List<DistributionReservationZeroPackageExcel> exportDistributionReservationZeroPackage(Wrapper<DistributionReservationZeroPackageEntity> queryWrapper);
 
+	/**
+	 * 查询预约数量
+	 * @param parcelListId
+	 * @return
+	 */
+    DistributionReservationZeroPackageEntity getOneZeroPackageNum(Long parcelListId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
index b9f794fc6..6f38fd212 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
@@ -171,7 +171,7 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 */
 	Integer selectPackage(StockupDTO stockupDTO);
 
-	DistributionStockupSelfVO selectStockupDetails(Long reservationId);
+	DistributionStockupSelfVO selectStockupDetails(Long reservationId,String isZero);
 
 	DistributionStockupSelfVO selectStockupStockListDetails(Long reservationId);
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java
index a7546e68f..5fcc7fc59 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java
@@ -76,5 +76,10 @@ public interface IDistrilbutionBillStockService extends BaseService<Distrilbutio
 
 	List<DistributionStockupSelfVO> selectDistrilbutionBillOverPackWuSelf(StockupDTO stockupDTO);
 
+	/**
+	 * 自提查询包件信息 除了零担的包件信息
+	 * @param reservationId
+	 * @return
+	 */
     List<DistributionStockPackageVO> listPackageSelf(Long reservationId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 7463d6919..2c0e12ccf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -13,6 +13,7 @@ import com.logpm.distribution.dto.app.StockupZeroDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.mapper.*;
 import com.logpm.distribution.service.*;
+import com.logpm.distribution.vo.DistributionStockPackageVO;
 import com.logpm.distribution.vo.DistributionStockupSelfVO;
 import com.logpm.distribution.vo.DistrilbutionBillStockVO;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
@@ -863,8 +864,36 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			}
 		});
 		if(pian.get()){
+			//查询有没有不是零担的订单
+			List<DistributionStockPackageVO> distributionStockPackageVOS = distrilbutionBillStockService.listPackageSelf(stockupDTO.getReservationId());
+			if(!distributionStockPackageVOS.isEmpty()){
+				AtomicReference<Boolean> s = new AtomicReference<>(false);
+				distributionStockPackageVOS.forEach( i ->{
+					QueryWrapper<DistributionStockEntity> queryWrapper1 = new QueryWrapper<>();
+					queryWrapper1.eq("stock_article",i.getStockArticleId());
+					queryWrapper1.eq("parcel_list_id",i.getParcelListId());
+
+					if(stockupDTO.getTypeService().equals("3")){
+						queryWrapper1.eq("bill_lading_id",stockupDTO.getReservationId());
+					}else{
+						queryWrapper1.eq("reservation_id",stockupDTO.getReservationId());
+					}
+					DistributionStockEntity stockEntity = distributionStockService.selectOne(queryWrapper1);
+					if(ObjectUtils.isNull(stockEntity)){
+						//没有扫
+						s.set(true);
+					}
+
+				});
+				if(s.get()){
+					stockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue());
+				}else{
+					stockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
+				}
+			}else{
+				stockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
+			}
 			stockupEntity.setId(stockupDTO.getStockupId());
-			stockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
 			stockupEntity.setFixTime(new Date());
 		}else{
 			stockupEntity.setId(stockupDTO.getStockupId());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java
index fef418b7f..0fa7f7bcd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java
@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity;
 import com.logpm.distribution.vo.DistributionReservationZeroPackageVO;
 import com.logpm.distribution.excel.DistributionReservationZeroPackageExcel;
@@ -51,4 +52,17 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm
 		return distributionReservationZeroPackageList;
 	}
 
+	/**
+	 * 查询预约数量
+	 * @param parcelListId
+	 * @return
+	 */
+	@Override
+	public DistributionReservationZeroPackageEntity getOneZeroPackageNum(Long parcelListId) {
+		return baseMapper.selectOne(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+			.eq(DistributionReservationZeroPackageEntity::getParcelListId, parcelListId)
+			.eq(DistributionReservationZeroPackageEntity::getIsDeleted, '0')
+			.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3"));
+	}
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index fa67d95e4..ce727e1ff 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -289,12 +289,54 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 //		IPage<DistributionStockupListVO> distributionStockupEntityIPage = baseMapper.selectStockupPage(page, stockupDTO);
 		List<DistributionStockupListVO> records = distributionStockupEntityIPage.getRecords();
 		for (DistributionStockupListVO vo : records) {
+			AtomicReference<Boolean> b = new AtomicReference<>(false);
+			AtomicReference<Integer> nu = new AtomicReference<>(0);
+			List<DistributionStockupInfoEntity> list1 = distributionStockupInfoService.list(Wrappers.<DistributionStockupInfoEntity>query().lambda().eq(DistributionStockupInfoEntity::getStockupId, vo.getId()));
+			list1.forEach( z ->{
+				//查询有没有零担
+				List<DistributionReservationZeroPackageEntity> list = reservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+					.eq(DistributionReservationZeroPackageEntity::getReservationId, z.getReservationId())
+				);
+				if(list.isEmpty()){
+					//有定制品 查询数量
+					if(z.getStockUpType().equals("3")){
+						//自提
+						List<DistributionStockPackageVO> list2 = distrilbutionBillStockService.listPackageSelf(z.getReservationId());
+						nu.set(list2.size());
+					}else{
+						//商，市
+						List<DistributionReservationPackageEntity> list2 = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+							.eq(DistributionReservationPackageEntity::getReservationId, z.getReservationId())
+							.eq(DistributionReservationPackageEntity::getIsDeleted,0)
+							.in(DistributionReservationPackageEntity::getPacketBarStatus,"1","3")
+						);
+						nu.set(list2.size());
+					}
+				}else{
+					// 查询零担数量
+					List<DistributionReservationZeroPackageEntity> list2 = reservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+						.eq(DistributionReservationZeroPackageEntity::getReservationId, z.getReservationId())
+						.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
+						.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3")
+					);
+					int sum = list2.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
+					nu.set((int) (nu.get() + sum));
+					b.set(true);
+					//自提
+					List<DistributionStockPackageVO> list2self = distrilbutionBillStockService.listPackageSelf(z.getReservationId());
+					nu.set(nu.get()+list2self.size());
+				}
+
+			});
+			if(b.get()){
+				vo.setPlanNum(nu.get());
+			}
 			//查询以扫数量
 			List<DistributionStockEntity> list = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda().eq(DistributionStockEntity::getStockupId, vo.getId()));
 			if(list.isEmpty()){
 				vo.setRealNum(0);
 			}else{
-				vo.setRealNum(list.size());
+				vo.setRealNum(list.stream().mapToInt(DistributionStockEntity::getStockQuantity).sum());
 			}
 			intToStrDistributionStockupListVO(vo);
 			if (ObjectUtils.isNull(vo.getInventoryNub())) {
@@ -378,6 +420,23 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if (vo.getTypeService().equals(3)) {
 				//自
 				List<DistributionStockupListVO> list = baseMapper.selectStockupClientInfoSelf(stockupDTO);
+				list.forEach( i ->{
+					QueryWrapper<DistributionReservationZeroPackageEntity> queryWrapper = new QueryWrapper<>();
+					//查询有没有零担数据
+					queryWrapper.eq("reservation_id",i.getReservationId());
+					queryWrapper.eq("is_deleted",0);
+					queryWrapper.in("zero_package_status","1","3");
+					List<DistributionReservationZeroPackageEntity> list1 = reservationZeroPackageService.list(queryWrapper);
+					if(!list1.isEmpty()){
+						//有
+						i.setPlanNum(list1.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum());
+					}
+						//没有
+						List<DistributionStockPackageVO> list2 = distrilbutionBillStockService.listPackageSelf(i.getReservationId());
+						i.setPlanNum(i.getPlanNum()+list2.size());
+
+				});
+
 				map.put("orderList", list);
 			} else {
 				//商 ，市
@@ -534,15 +593,21 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			List<DistributionStockupOrderListVO> collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList());
 			Set<DistributionStockupOrderListVO> listYou = new HashSet<>();
 			collect11.forEach( i -> {
+				DistributionReservationZeroPackageEntity one = new DistributionReservationZeroPackageEntity();
+				if(stockupDTO.getIsZero().equals("1")) {
+					//零担 查询预约数量
+					one = reservationZeroPackageService.getOneZeroPackageNum(i.getParcelListId());
+				}
+				int i1 = stockupDTO.getIsZero().equals("1") ? one.getQuantity() : 1;
 				if(listYou.size() > 0){
 					boolean b = listYou.stream().anyMatch(o -> o.getAllocationId().equals(i.getAllocationId()));
 					if(b){
 						listYou.forEach( y -> {
 							if(y.getAllocationId().equals(i.getAllocationId())){
 								//相同
-								y.setPlanNum(y.getPlanNum()+1);
+								y.setPlanNum(y.getPlanNum()+i1);
 								if(ObjectUtils.isNotNull(i.getStockId())){
-									y.setScanNum(y.getScanNum()+1);
+									y.setScanNum(y.getScanNum()+i1);
 								}
 								//t托盘信息
 								if(ObjectUtils.isNotNull(y.getTrayId()) && ObjectUtils.isNotNull(i.getTrayId()) && !y.getTrayId().equals(i.getTrayId())){
@@ -559,9 +624,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 							}
 						} );
 					}else{
-						i.setPlanNum(1);
+						i.setPlanNum(i1);
 						if(ObjectUtils.isNotNull(i.getStockId())){
-							i.setScanNum(1);
+							i.setScanNum(i1);
 						}else{
 							i.setScanNum(0);
 						}
@@ -569,9 +634,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					}
 
 				}else{
-					i.setPlanNum(1);
+					i.setPlanNum(i1);
 					if(ObjectUtils.isNotNull(i.getStockId())){
-						i.setScanNum(1);
+						i.setScanNum(i1);
 					}else{
 						i.setScanNum(0);
 					}
@@ -599,14 +664,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			//有
 			if(!collectY.isEmpty()){
 				collectY.forEach( i -> {
+					DistributionReservationZeroPackageEntity one = new DistributionReservationZeroPackageEntity();
+					if(stockupDTO.getIsZero().equals("1")) {
+						//零担 查询预约数量
+						one = reservationZeroPackageService.getOneZeroPackageNum(i.getParcelListId());
+					}
+					int i1 = stockupDTO.getIsZero().equals("1") ? one.getQuantity() : 1;
 					boolean b = listYou.stream().anyMatch(ii ->ii.getAllocationId().equals(i.getAllocationId()));
 					if(b){
 						listYou.forEach( wu -> {
 							if(wu.getAllocationId().equals(i.getAllocationId())){
 								//相同
-								wu.setPlanNum(wu.getPlanNum()+1);
+								wu.setPlanNum(wu.getPlanNum()+i1);
 								if(ObjectUtils.isNotNull(i.getStockId())){
-									wu.setScanNum(wu.getScanNum()+1);
+									wu.setScanNum(wu.getScanNum()+i1);
 								}
 								//托盘信息
 								if(ObjectUtils.isNotNull(wu.getTrayId()) && ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().equals(i.getTrayId())){
@@ -628,9 +699,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 							}
 						});
 					}else{
-						i.setPlanNum(1);
+						i.setPlanNum( i1);
 						if(ObjectUtils.isNotNull(i.getStockId())){
-							i.setScanNum(1);
+							i.setScanNum(i1);
 							i.setCompleteStact(true);
 						}else{
 							i.setScanNum(0);
@@ -640,14 +711,22 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				});
 			}
 			collectW.forEach(i ->{
+				DistributionReservationZeroPackageEntity one = new DistributionReservationZeroPackageEntity();
+				if(stockupDTO.getIsZero().equals("1")) {
+					//零担 查询预约数量
+					one = reservationZeroPackageService.getOneZeroPackageNum(i.getParcelListId());
+				}
+				int i1 = stockupDTO.getIsZero().equals("1") ? one.getQuantity() : 1;
 				boolean b = listYou.stream().anyMatch(ko -> ObjectUtils.isNull(ko.getAllocationId()));
 				if(b){
-					listYou.forEach( wu -> {
+
+					listYou.forEach(wu -> {
 						if(ObjectUtils.isNull(wu.getAllocationId())){
 							//相同
-							wu.setPlanNum(wu.getPlanNum()+1);
+
+							wu.setPlanNum(wu.getPlanNum()+i1);
 							if(ObjectUtils.isNotNull(i.getStockId())){
-								wu.setScanNum(wu.getScanNum()+1);
+								wu.setScanNum(wu.getScanNum()+i1);
 							}
 							//托盘信息
 							if(ObjectUtils.isNotNull(wu.getTrayId()) && ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().equals(i.getTrayId())){
@@ -669,9 +748,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						}
 					});
 				}else{
-					i.setPlanNum(1);
+					i.setPlanNum(i1);
 					if(ObjectUtils.isNotNull(i.getStockId())){
-						i.setScanNum(1);
+						i.setScanNum(i1);
 						i.setCompleteStact(true);
 					}else{
 						i.setScanNum(0);
@@ -1773,10 +1852,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	/**
 	 * @param reservationId
+	 * @param isZero
 	 */
 	@Override
-	public DistributionStockupSelfVO selectStockupDetails(Long reservationId) {
-		return baseMapper.selectStockupDetails(reservationId);
+	public DistributionStockupSelfVO selectStockupDetails(Long reservationId, String isZero) {
+		DistributionStockupSelfVO distributionStockupSelfVO = new DistributionStockupSelfVO();
+		if(isZero.equals("1")){
+			//零担
+			distributionStockupSelfVO = baseMapper.selectStockupDetailsZero(reservationId);
+		}else{
+			distributionStockupSelfVO = baseMapper.selectStockupDetails(reservationId);
+		}
+		return distributionStockupSelfVO;
 	}
 
 	@Override
@@ -1976,6 +2063,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			DistributionStockEntity stockEntity = new DistributionStockEntity();
 			stockEntity.setStockArticle(i.getStockArticleId());
 			stockEntity.setStockupId(stockupDTO.getStockupId());
+			DistributionReservationZeroPackageEntity byId = reservationZeroPackageService.getById(i.getId());
+			stockEntity.setParcelListId(Optional.ofNullable(byId.getParcelListId()).orElse(null) );
 			stockEntity.setBillLadingId(stockupDTO.getReservationId());
 			stockEntity.setConditions("2");
 			stockEntity.setGoodsName(i.getFirsts());