Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -1715,7 +1715,7 @@
         ldpl.id AS id,
         ldrzp.quantity AS reservationNum,
         IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS loadingNum,
-        IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS  signingNum ,
+        IF(ldl.received_quantity is null,0,ldl.loaded_nub) AS  signingNum ,
         CASE IF(ldl.loaded_nub is null,0,ldl.loaded_nub)
         WHEN 0 THEN '待装车'
         ELSE IF(ldl.loaded_nub = ldrzp.quantity,'已装车','部分装车')

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -900,8 +900,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		Long loadingId = null;
 		List<DistributionDeliverySelfVO> deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId());
 		//查询该车次负责司机
-
-
 		for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
 			//查询订单
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(reservationZeroPackageEntity.getStockArticleId());
@@ -919,7 +917,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			int d = 0;
 			DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
 				.eq(DistributionLoadscanEntity::getReservationId, reservationId)
-				.in(DistributionLoadscanEntity::getPackageId, list)
+				.in(DistributionLoadscanEntity::getPackageId, reservationZeroPackageEntity.getParcelListId())
 				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 			);
 			if (Func.isEmpty(loadscanEntity)) {