Merge branch 'dev' into pre-production

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

@@ -453,6 +453,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			} else {
 				updateStockBill(distrilbutionBillLading);
 			}
+			List<DistributionStockArticleEntity> stockArticleList = distrilbutionBillLading.getStockArticleList();
+			if (Func.isNotEmpty(stockArticleList)){
+				String orderCodes = stockArticleList.stream().map(DistributionStockArticleEntity::getOrderCode).collect(Collectors.joining(","));
+				List<Long> collect = stockArticleList.stream().map(DistributionStockArticleEntity::getWarehouseId).distinct().collect(Collectors.toList());
+				if (!collect.isEmpty() && collect.size() == 1){
+					distributionStockArticleService.maintenanceOrderInfo(orderCodes,collect.get(0));
+				}
+			}
 		} else {
 			//设置lockey
 			String lockKey = "lock:" + distrilbutionBillLading.getStockArticleId();
@@ -1274,14 +1282,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						}
 					}
 				}
-				DistributionStockArticleEntity stockArticleEntity = collect.get(i.getStockArticleId()).get(0);
-				if (Func.isNotEmpty(stockArticleEntity)){
-					distributionStockArticleService.maintenanceOrderInfo(stockArticleEntity.getOrderCode(),stockArticleEntity.getWarehouseId());
-				}else {
-					log.error("#########################修改自提单维护订单数据错误orderId:{}",i.getStockArticleId());
-					throw new RuntimeException("修改自提单维护订单数据错误");
-				}
-
 			});
 			if (!longs.isEmpty()) {
 //				distributionZeroPackageService.deleteLogic(longs);