1.修改预约在库订单批量修改客户信息的问题

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -377,17 +377,25 @@ public class DistributionStockArticleController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入distributionStockArticle")
 	public R updateBatchClient(@Valid @RequestBody DistributionStockArticleDTO distributionStockArticleDTO) {
+
+
+		// 获取勾选的需要修改的订单信息
+		List<Long> ids = distributionStockArticleDTO.getEntityList().stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList());
+		// 查询这个订单集合的预约状态
+		List<DistributionStockArticleEntity> realStockArticleList = distributionStockArticleService.listByIds(ids);
+
 		List<DistributionStockArticleEntity> entityList = distributionStockArticleDTO.getEntityList();
-		if (!entityList.isEmpty()) {
+		if (!realStockArticleList.isEmpty()) {
-			boolean flag = entityList.stream().anyMatch(a -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(a.getReservationStatus()));
+			boolean flag = realStockArticleList.stream().anyMatch(a -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(a.getReservationStatus()));
 			if (flag) {
-				String orderCode = entityList.stream().filter(f -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getReservationStatus())).map(DistributionStockArticleEntity::getOrderCode).distinct().collect(Collectors.joining(","));
+				String orderCode = realStockArticleList.stream().filter(f -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getReservationStatus())).map(DistributionStockArticleEntity::getOrderCode).distinct().collect(Collectors.joining(","));
 				return R.fail(orderCode + "存在预约信息");
 			}
 		}
+
 		for (DistributionStockArticleEntity stockArticleEntity : entityList) {
 			Long id = stockArticleEntity.getId();
-			DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(id);
+			DistributionStockArticleEntity oldStockArticle =realStockArticleList.stream().filter(f -> f.getId().equals(id)).findFirst().orElse(null);
 			DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity();
 			BeanUtil.copy(oldStockArticle, newStockArticle);
 			String consigneePerson = stockArticleEntity.getConsigneePerson();