增加详情装车限制

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

@@ -9008,13 +9008,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//查询库存品
 				reservationId = baseMapper.selectInventoryPackageByDeliveryIdAndInventoryPackageCode(deliveryId, inventoryPackageCode);
 				if (Objects.isNull(reservationId)) {
-					DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
 
-					if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
-						if (!reservationId.equals(distrilbutionloadingscanDTO.getReservationId())) {
-							return Resp.scanFail("请在"+reservationEntity.getConsignee()+"客户扫描此码", "请在"+reservationEntity.getConsignee()+"客户扫描此码");
-						}
-					}
 					parcelListEntity = distributionParcelListMapper.selectByOrderPackageCode(inventoryPackageCode, myCurrentWarehouse.getId());
 					if (!Objects.isNull(parcelListEntity)) {
 						return Resp.scanFail("请在定制品页面扫描此码", "请在定制品页面扫描此码");
@@ -9022,6 +9016,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						return Resp.scanFail("系统无编码", "系统无编码");
 					}
 				}
+				DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+
+				if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
+					if (!reservationId.equals(distrilbutionloadingscanDTO.getReservationId())) {
+						return Resp.scanFail("请在"+reservationEntity.getConsignee()+"客户扫描此码", "请在"+reservationEntity.getConsignee()+"客户扫描此码");
+					}
+				}
 				List<DisStockListDetailEntity> invemtoryPackageList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
 					.eq(DisStockListDetailEntity::getReservationId, reservationId)
 					.eq(DisStockListDetailEntity::getStockPackageCode, inventoryPackageCode)