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 30ebeae06..218def9c9 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
@@ -277,7 +277,7 @@
                 and date_format(lddl.task_time,'%y%m%d%') = date_format(#{param.taskTime},'%y%m%d%')
             </if>
             <if test="param.taskTimeStart!=null and param.taskTimeStart!=''">
-                and date_format(lddl.task_time,'%y%m%d%') BETWEEN #{param.taskTimeStart} AND #{param.taskTimeEnd}
+                and date_format(lddl.task_time,'%y%m%d%') BETWEEN   date_format( #{param.taskTimeStart}, '%y%m%d%' ) AND  date_format( #{param.taskTimeEnd}, '%y%m%d%' )
             </if>
         </where>
         GROUP BY lddl.id ,
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 760172b2a..426fb1720 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
@@ -156,7 +156,7 @@
         logpm_distrilbution_bill_lading  AS ldbl
         LEFT JOIN logpm_distrilbution_bill_stock ldbs  ON ldbs.bill_lading_id = ldbl.id
         LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
-        LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id
+        LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id AND ldbs.stock_article_id = ldbls.stock_article_id
         <where>
             ldbs.is_deleted = 0 and  ldbs.bill_lading_id = #{param.billLadingId}  and ldbs.order_status in (1,3)
         </where>
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 71be5320e..6d89d96f5 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
@@ -3093,7 +3093,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 								//查询此订单所有签收信息
 								List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 									.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
-									.eq(DistributionBillLadingScanEntity::getStockArticleId, orderList2.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+									.in(DistributionBillLadingScanEntity::getStockArticleId, orderList2.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
 								);
 								Map<Long, List<DistributionStockArticleEntity>> mtOrderMap = orderList2.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getId));
 								//处理数据构建
@@ -3144,7 +3144,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 								List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 									.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
-									.eq(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+									.in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
 								);
 								if (!ladingScanEntities.isEmpty()) {
 									SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss");
@@ -3167,7 +3167,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 								List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 									.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
-									.eq(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+									.in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
 								);
 								if (!ladingScanEntities.isEmpty()) {
 									for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
@@ -3190,7 +3190,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 								List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 									.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
-									.eq(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+									.in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
 								);
 								List<Object> contents = new ArrayList<>();
 								if (!ladingScanEntities.isEmpty()) {
@@ -3220,7 +3220,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 								List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 									.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
-									.eq(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+									.in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
 								);
 								List<Object> contents = new ArrayList<>();
 								if (!ladingScanEntities.isEmpty()) {
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 05643037e..af70bca74 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
@@ -4555,12 +4555,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			builder.append("异常" + abnormalPackageLoadingNum + "件");
 		}
 
-//		builder.append("共计装车"+loadingCount+"件");
-
-//		if (planCount.get() == loadingCount && abnormalPackageLoadingNum == 0){
-//			return R.status(b);
-//		}else if (abnormalPackageLoadingNum != 0){
-//		}
 		distributionAsyncService.sendTrunkineLog(distributionDeliveryListEntity.getId(), null, AuthUtil.getUser(), warehouseClient.getMyCurrentWarehouse(), 1);
 
 		return Resp.scanFail("发车成功", builder.toString());