Merge branch 'dev' into pre-production

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

@@ -340,19 +340,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				if (!order) {
 					throw new ServiceException("修改失败！！");
 				}
-				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 {
-						throw new ServiceException("修改失败！！");
-
-					}
-				}
-
-
 			}
 
 		/*	else{
@@ -1229,6 +1216,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	 * @param distrilbutionBillLadingDTO
 	 * @return
 	 */
+	@Transactional(rollbackFor = Exception.class)
 	public int updetaParcelNum(DistrilbutionBillLadingDTO distrilbutionBillLadingDTO) {
 		List<DistributionReservationZeroPackageEntity> list = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
 			.eq(DistributionReservationZeroPackageEntity::getReservationId, distrilbutionBillLadingDTO.getId())
@@ -1291,6 +1279,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						}
 					}
 				}
+				List<DistributionStockArticleEntity> distributionStockArticleEntities = collect.get(i.getStockArticleId());
+				String orderCode = distributionStockArticleEntities.get(0).getOrderCode();
+				Long warehouseId = distributionStockArticleEntities.get(0).getWarehouseId();
+				log.info("#############维护零担订单信息:{},:{}",orderCode,warehouseId);
+				distributionStockArticleService.maintenanceOrderInfo(orderCode,warehouseId);
+
 			});
 			if (!longs.isEmpty()) {
 //				distributionZeroPackageService.deleteLogic(longs);