维护自提打印报错

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

@@ -5160,14 +5160,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			List<Long> orderPackageIds = ts.stream()
 				.map(DistributionParcelListEntity::getId) // 获取每个对象的包件ID
 				.collect(Collectors.toList());
+			if (Func.isNotEmpty(orderPackageCodes)){
+				List<String> allocationStrList = distributionParcelListMapper.selectAllocationInforByOrderPackageCode(orderPackageCodes, distrilbutionBillLadingEntity.getWarehouseId());
+				String allocationStr = StringUtils.join(allocationStrList, ",");
+				tempMap.put("货位", allocationStr);
+			}
 
-
-			List<String> allocationStrList = distributionParcelListMapper.selectAllocationInforByOrderPackageCode(orderPackageCodes, distrilbutionBillLadingEntity.getWarehouseId());
-			String allocationStr = StringUtils.join(allocationStrList, ",");
-			tempMap.put("货位", allocationStr);
 			//通过订单id和预约id查询对应包件的备货区信息
 			LambdaQueryWrapper<DistributionStockEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-			lambdaQueryWrapper.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()).in(DistributionStockEntity::getParcelListId, orderPackageIds);
+			lambdaQueryWrapper.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
+				.in(DistributionStockEntity::getParcelListId, orderPackageIds);
 			List<DistributionStockEntity> distributionStockEntities = distributionStockMapper.selectList(lambdaQueryWrapper);
 
 			Set<String> stockupAreaStrList = distributionStockEntities.stream().map(DistributionStockEntity::getStockupArea).collect(Collectors.toSet());

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

@@ -4295,7 +4295,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //									2、多个车次的配送任务进行一件签收状态、在没有进行装车操作的时候
 //
 //									3、对于已经装车的库存品或者包件在一件签收的时候需要进行过滤
-
 		this.updatePicture(distributionSignfor);
 		//2、维护状态
 		DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionSignfor.getReservationId());
@@ -4707,16 +4706,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 		}
 
-		DistributionSignforEntity signforEntity = this.getById(distributionSignforEntity.getId());
-		signforEntity.setLoadedNumber(signforEntity.getLoadedNumber() + loadingPackageNum );
-		signforEntity.setReceivedQuantity(signforEntity.getReceivedQuantity() + signingPackageNum );
-		signforEntity.setLoadedinNumber(signforEntity.getLoadedinNumber() + loadingInventoryNum );
-		signforEntity.setReceivedinQuantity(signforEntity.getReceivedinQuantity() + signingInventoryNum );
-		signforEntity.setReceivedinQuantity(signforEntity.getReceivedinQuantity() + signingInventoryNum );
+		distributionSignforEntity.setLoadedNumber(distributionSignforEntity.getLoadedNumber() + loadingPackageNum );
+		distributionSignforEntity.setReceivedQuantity(distributionSignforEntity.getReceivedQuantity() + signingPackageNum );
+		distributionSignforEntity.setLoadedinNumber(distributionSignforEntity.getLoadedinNumber() + loadingInventoryNum );
+		distributionSignforEntity.setReceivedinQuantity(distributionSignforEntity.getReceivedinQuantity() + signingInventoryNum );
+		distributionSignforEntity.setReceivedinQuantity(distributionSignforEntity.getReceivedinQuantity() + signingInventoryNum );
 		if (Func.isNotEmpty(distributionSignfor.getDriverRemarks())){
-			signforEntity.setDriverRemarks(distributionSignfor.getDriverRemarks());
+			distributionSignforEntity.setDriverRemarks(distributionSignfor.getDriverRemarks());
 		}
-		this.updateById(signforEntity);
+		this.updateById(distributionSignforEntity);
 //		LambdaUpdateWrapper<DistributionSignforEntity> set = new UpdateWrapper<DistributionSignforEntity>().lambda()
 ////			.eq(DistributionSignforEntity::getId, distributionSignforEntity.getId())
 ////			.set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures())