diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
index f9780a1df..48d4d5077 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
@@ -78,6 +78,11 @@ public class OldSystemDataPushConfig {
 
 		// 攀枝花
 		warehourseIds.add("32");
+		// 万州仓
+		warehourseIds.add("50");
+
+		//广元仓
+		warehourseIds.add("40");
 
 	}
 
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
index 40f944836..f81731ed7 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
@@ -134,6 +134,11 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	 * 签收数量
 	 */
 	private String  loadingTime;
+
+	/**
+	 * 配送车次号
+	 */
+	private String  deliveryTrainNumber;
 	/**
 	 * 实际装车人
 	 */
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
index 5b37b61c9..aebfc01c2 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
@@ -170,6 +170,11 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	 */
 	private String isZeroString;
 
+	/**
+	 * 是否零担显示
+	 */
+	private String reservationCode;
+
 	private Integer unreceivedQuantity;
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java
index 9eeaa1d32..1d80793c7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java
@@ -39,6 +39,20 @@ public class DistributionDeliveryPackageExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送车次号")
+	private String deliveryTrainNumber;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约单号")
+	private String reservationCode;
+
 	/**
 	 * 租户号
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index 4918a1739..b3937b3cb 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -372,7 +372,7 @@
         LEFT JOIN logpm_distribution_delivery_tripartite AS lddt ON ldds.delivery_id = lddl.id AND lddt.is_deleted = 0
         <where>
            lddl.is_deleted = 0
-           <if test=" params.ids != ''">
+           <if test=" params.ids != null">
                AND lddl.id in
                <foreach collection="params.ids" item="item" index="index" open="(" separator="," close=")">
                    #{item}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
index 144a2f312..a1f3f5734 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
@@ -241,10 +241,10 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 
 	/**
 	 * 查询预约订单信息
-	 * @param parseLong
+	 * @param reservationId
 	 * @return
 	 */
-	List<DistributionStockArticleVO> selectOrderInfoByReservationId(Long parseLong);
+	List<DistributionStockArticleVO> selectOrderInfoByReservationId(@Param("reservationId") Long reservationId);
 
 	/**
 	 * 查询预约零担订单详情
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index d328268e0..90c473006 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -1242,6 +1242,7 @@
             ldrs.is_have_data,
             ldsa.id AS id,
             ldsa.waybill_number AS waybillNumber,
+            lds.reservation_code AS reservationCode,
             ldrs.is_zero
         FROM
             logpm_distribution_reservation AS lds
@@ -1821,7 +1822,8 @@
        <where>
            ldrzp.reservation_id = #{param.reservationId} AND ldrzp.zero_package_status in ('1','3')
        </where>
-
+        GROUP BY
+        ldrzp.parcel_list_id
     </select>
     <select id="selectStockupZeroOrderList"
             resultType="com.logpm.distribution.vo.DistributionStockupOrderListVO">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 77aca1984..258cb7054 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -1032,7 +1032,8 @@
             ldpl.order_package_stockup_status AS orderPackageStockupStatus,
             ldpl.order_package_reservation_status AS orderPackageReservationStatus,
             ldpl.order_package_loading_status AS orderPackageLoadingStatus,
-            ldpl.material_name AS materialName
+            ldpl.material_name AS materialName,
+            ldpl.id AS packageId
         FROM
             logpm_distribution_loadscan_abnormal AS ldla
             LEFT JOIN logpm_distribution_loadscan AS ldl ON ldla.package_id = ldl.package_id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
index 699c89438..eab24d0a8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
@@ -53,7 +53,7 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 * @param
 	 * @return
 	 */
-	List<DistributionStockArticleEntity> exportDistributionStockArticle(@Param("paramMap") Map<String, Object> paramMap, @Param("idArr") List<String> idArr);
+	List<DistributionStockArticleEntity> exportDistributionStockArticle(@Param("param") Map<String, Object> paramMap);
 
     void addHandQuantity(@Param("id") Long id,@Param("num") int num);
 
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 68c5fa7f7..a4a151ded 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
@@ -838,39 +838,43 @@
                ldsa.order_delivery_status,
                group_concat(DISTINCT lwt.pallet_name)    as trays,
                group_concat(DISTINCT lwug.position_code)  as allocation
-        from logpm_platform.logpm_distribution_stock_article ldsa
-                 left join logpm_platform.logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
-                 left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
-                 left join logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
+
+              from logpm_distribution_stock_article ldsa
+                 left join logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
+                 left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
+                 left join logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
                 left JOIN logpm_warehouse_tray lwt on lwtg.tray_id= lwt.id
         <where>
             ldsa.is_deleted = 0 and ldsa.order_status IN ( 10, 20, 30, 40, 50, 60, 70 )
             and ldsa.hand_quantity > 0
             and ldsa.genre = 1
-            <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
-                and ldsa.warehouse_id = #{paramMap.warehouseId}
+            <if test="param.warehouseId != null and param.warehouseId != ''">
+                and ldsa.warehouse_id = #{param.warehouseId}
             </if>
-
-            <if test="paramMap.waybillNumber != null and paramMap.waybillNumber != ''">  and ldpl.waybill_number = #{paramMap.waybillNumber}  </if>
-            <if test="paramMap.orderCode != null and paramMap.orderCode != ''">  and ldsa.order_code = #{paramMap.orderCode}  </if>
-            <if test="paramMap.mallName != null and paramMap.mallName != ''">  and ldsa.mall_name = #{paramMap.mallName}  </if>
-            <if test="paramMap.typeService != null and paramMap.typeService != ''">  and ldsa.type_service = #{paramMap.typeService}  </if>
-            <if test="paramMap.consigneeUnit != null and paramMap.consigneeUnit != ''">  and ldsa.consignee_unit = #{paramMap.consigneeUnit}  </if>
-            <if test="paramMap.trainNumber != null and paramMap.trainNumber != ''">  and ldsa.train_number = #{paramMap.trainNumber}  </if>
-            <if test="paramMap.acceptWarehouseName != null and paramMap.acceptWarehouseName != ''">  and ldsa.accept_warehouse_name = #{paramMap.acceptWarehouseName}  </if>
-
-
-            <if test="paramMap.serviceNumber != null and paramMap.serviceNumber != ''">
-                and ldsa.servic_nNumber = #{paramMap.serviceNumber}
+            <if test="param.warehouseIds != null ">
+                and ldsa.warehouse_id in
+                <foreach collection="param.warehouseIds" item="wIitem" index="index" open="(" close=")" separator=",">
+                    #{wIitem}
+                </foreach>
             </if>
-            <if test="idArr != null and idArr != ''">
+            <if test="param.waybillNumber != null and param.waybillNumber != ''">  and ldpl.waybill_number = #{param.waybillNumber}  </if>
+            <if test="param.orderCode != null and param.orderCode != ''">  and ldsa.order_code = #{param.orderCode}  </if>
+            <if test="param.mallName != null and param.mallName != ''">  and ldsa.mall_name = #{param.mallName}  </if>
+            <if test="param.typeService != null and param.typeService != ''">  and ldsa.type_service = #{param.typeService}  </if>
+            <if test="param.consigneeUnit != null and param.consigneeUnit != ''">  and ldsa.consignee_unit = #{param.consigneeUnit}  </if>
+            <if test="param.trainNumber != null and param.trainNumber != ''">  and ldsa.train_number = #{param.trainNumber}  </if>
+            <if test="param.acceptWarehouseName != null and param.acceptWarehouseName != ''">  and ldsa.accept_warehouse_name = #{param.acceptWarehouseName}  </if>
+            <if test="param.serviceNumber != null and param.serviceNumber != ''">
+                and ldsa.service_number = #{param.serviceNumber}
+            </if>
+            <if test="param.orderIds != null ">
                 and ldsa.id in
-                <foreach collection="idArr" item="item" open="(" close=")" separator=",">
-                    #{item}
+                <foreach collection="param.orderIds" item="wIitem" index="index" open="(" close=")" separator=",">
+                    #{wIitem}
                 </foreach>
             </if>
         </where>
-        group by ldsa.id;
+        group by ldsa.id
     </select>
     <!--    <select id="selectAllDistributionOrder"-->
     <!--            resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">-->
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index b5df4d2ba..e5187fbaf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -387,6 +387,7 @@
         LEFT JOIN logpm_warehouse_updown_goods lwug on ldsi.material_id = lwug.association_id and ldsi.incoming_batch = lwug.incoming_batch
         and ldsi.market_id = lwug.market_id and lwug.association_type = '4' and lwug.warehouse_id = ldsi.warehouse_id
         <where>
+            lwug.id is not null
             <if test="param.materialId != null and param.materialId != '' "> and  ldsi.material_id = #{param.materialId}</if>
             <if test="param.marketId != null and param.marketId != '' "> and ldsi.market_id = #{param.marketId}</if>
             <if test="param.warehouseId != null and param.warehouseId != '' "> and ldsi.warehouse_id = #{param.warehouseId}</if>
@@ -414,6 +415,7 @@
         AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch
         LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '3'
         <where>
+            lwug.id is not null
             <if test="param.id != null "> and  ldsi.id = #{param.id}</if>
         </where>
         group by lwug.allocation_id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index dbf42eb3a..4a693961a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -89,7 +89,7 @@
             <if test="param.consigneeUnit != null and param.consigneeUnit != ''">and dsa.consignee_unit like
                 concat('%',#{param.consigneeUnit},'%')
             </if>
-            <if test="param.customerName != null and param.customerName != ''">and dsa.customer_name like
+            <if test="param.customerName != null and param.customerName != ''">and dbl.customer_name like
                 concat('%',#{param.customerName},'%')
             </if>
             <if test="param.customerTelephone != null and param.customerTelephone != ''">and dsa.customer_telephone like
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 d3839e21f..712d37788 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
@@ -150,7 +150,7 @@
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3'
         where ldpl.stock_article_id = ldbs.stock_article_id)  goodsAllocation,
-        ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName
+        ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName,
         GROUP_CONCAT(DISTINCT ldbls.scan_user) AS scanUser ,MAX(ldbls.create_time) AS signingTime
         from
         logpm_distrilbution_bill_lading  AS ldbl
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 7038e1b2b..426830bd0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -264,7 +264,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Func.isNotEmpty(distributionDeliveryList.get("ids"))){
 			//进行勾选操作
 			List<Long> deliveryId = Func.toLongList((String) distributionDeliveryList.get("ids"));
-			distributionDeliveryList.put("ids",deliveryId);
+			if (!deliveryId.isEmpty()){
+				distributionDeliveryList.put("ids",deliveryId);
+			}
+		}else {
+			distributionDeliveryList.remove("ids");
 		}
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(myCurrentWarehouse)){
@@ -296,8 +300,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			deliveryListExcel.setScannedNumber(dis.getScannedNumber());
 			deliveryListExcel.setSigningNumber(dis.getSigningNumber());
 			deliveryListExcel.setLoadingTeam(dis.getHandlingCrew());
-			BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(dis.getWarehouseId());
-			deliveryListExcel.setWarehouseName(entityWarehouseId.getName());
+			if (!Objects.isNull(dis.getWarehouseId())){
+				BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(dis.getWarehouseId());
+				deliveryListExcel.setWarehouseName(entityWarehouseId.getName());
+			}
 			list.add(deliveryListExcel);
 		});
 		return list;
@@ -704,7 +710,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 				//更新签收表的装车数量
 				Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
-
+				//进行解托操作
+				Map<String,Object> info = new HashMap<>();
+				info.put("orderPackageCode",parcelListEntity.getOrderPackageCode());
+				info.put("warehouseId",myCurrentWarehouse.getId());
+				warehouseUpdownTypeClient.downDeliveryPackage(info);
 
 				Map<String, Object> map = new HashMap();
 				String distrilbutionloadingscanDTOJson = JSONObject.toJSONString(distrilbutionloadingscanDTO);
@@ -730,6 +740,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				});
 
 
+
+
 				//extracteOrderPackageStatus(distrilbutionloadingscanDTO, parcelListEntity, myCurrentWarehouse, reservationEntity);
 
 
@@ -4348,6 +4360,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			return null;
 		}
 		Long deliveryId = Long.parseLong((String) distributionDeliveryInfoDTO.get("deliveryId"));
+		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId);
 		//查询零担订单包件
 //		List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId());
 		List<DistributionStockArticleVO> deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId);
@@ -4370,6 +4383,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
 		if (Func.isNotEmpty(reservationStockarticleEntityList)) {
 			List<Long> orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
+			List<Long> reservationId = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).collect(Collectors.toList());
+			Map<Long,String> map = new HashMap<>();
+			if (!reservationId.isEmpty()) {
+				for (Long l : reservationId) {
+					List<DistributionStockArticleVO> distributionStockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(l);
+					distributionStockArticleVOS.forEach(s->{
+						map.put(s.getId(),s.getReservationCode());
+					});
+				}
+			}
 			if (Func.isNotEmpty(orderIds)) {
 				//查询该客户的非零但订单包间
 				IPage<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(page, orderIds, distributionDeliveryInfoDTO);
@@ -4379,6 +4402,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList.getRecords());
 				for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
 //					log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO);
+					distributionParcelListVO.setDeliveryTrainNumber(deliveryListEntity.getTrainNumber());
+					if (!map.isEmpty()){
+						distributionParcelListVO.setReservationCode(map.get(distributionParcelListVO.getStockArticleId()));
+					}
 					if (Func.isNotEmpty(loadingDataMap)) {
 						DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId());
 //						log.info(">>>>>> loadscanEntity {}", loadscanEntity);
@@ -4602,6 +4629,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //		Long deliveryId = Long.parseLong((String) distributionDeliveryInfoDTO.get("deliveryId"));
 		//查询零担订单包件
 //		List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId());
+		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId);
+
 		List<DistributionStockArticleVO> deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId);
 		if (Func.isEmpty(deliveryStockArticleInfo)) {
 			log.error("配送任务订单查询异常:{}", deliveryStockArticleInfo);
@@ -4622,6 +4651,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
 		if (Func.isNotEmpty(reservationStockarticleEntityList)) {
 			List<Long> orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
+			List<Long> reservationId = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).collect(Collectors.toList());
+			Map<Long,String> map = new HashMap<>();
+			if (!reservationId.isEmpty()) {
+				for (Long l : reservationId) {
+					List<DistributionStockArticleVO> distributionStockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(l);
+					distributionStockArticleVOS.forEach(s->{
+						map.put(s.getId(),s.getReservationCode());
+					});
+				}
+			}
 			if (Func.isNotEmpty(orderIds)) {
 				//查询该客户的非零但订单包间
 				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackageByDeliveryId(orderIds, deliveryId);
@@ -4631,6 +4670,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
 				for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
 					log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO);
+					distributionParcelListVO.setDeliveryTrainNumber(deliveryListEntity.getTrainNumber());
+					if (!map.isEmpty()){
+						distributionParcelListVO.setReservationCode(map.get(distributionParcelListVO.getStockArticleId()));
+					}
 					if (Func.isNotEmpty(loadingDataMap)) {
 						DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId());
 						log.info(">>>>>> loadscanEntity {}", loadscanEntity);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index be6d48f19..52cc51a4e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -5672,6 +5672,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				log.info("执行批量保存 {}",distributionSignPrintList);
 				return iDistributionSignPrintService.saveBatch(distributionSignPrintList);
 			}
+			this.update(Wrappers.<DistributionSignforEntity>update().lambda()
+				.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
+				.set(DistributionSignforEntity::getDriverSigning, "2")
+				.set(!Objects.isNull(distributionSignfor.getDriverRemarks()),DistributionSignforEntity::getDriverRemarks, "2")
+			);
 
 		}
 		return false;
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 02c38752e..03d80f041 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -165,20 +165,29 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		// 获取当前登录的仓库信息
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtils.isNull(myCurrentWarehouse)) {
-			throw new ServiceException("没有仓库信息！");
+			//查询当前用户的仓库列表
+			List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
+			if (!warehouseList.isEmpty()){
+				List<Long> warehouseListIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+				paramMap.put("warehouseIds", warehouseListIds);
+			}
+		}else {
+			paramMap.put("warehouseId", myCurrentWarehouse.getId());
 		}
 		// 用户勾选数据的ids
 		Object ids = paramMap.get("ids");
-		List<String> idArr = null;
+		List<Long> idArr = null;
 		if (null != ids && !"".equals(ids.toString())) {
-			idArr = Arrays.asList(paramMap.get("ids").toString().split(","));
+//			idArr = Arrays.asList(paramMap.get("ids").toString().split(","));
+			idArr = Func.toLongList((String) paramMap.get("ids"));
+
 		}
 
 		String tenantId = AuthUtil.getTenantId();
-		paramMap.put("warehouseId", myCurrentWarehouse.getId());
 		paramMap.put("tenantId", tenantId);
+		paramMap.put("orderIds", idArr);
 
-		List<DistributionStockArticleEntity> list = baseMapper.exportDistributionStockArticle(paramMap, idArr);
+		List<DistributionStockArticleEntity> list = baseMapper.exportDistributionStockArticle(paramMap);
 		List<DistributionStockArticleExcel> excelList = new ArrayList<>();
 //
 		list.forEach(li -> {