Merge branch 'dev' into pre-production

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

@@ -1416,13 +1416,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 
 		}
-		List<Long> addOrderIds = new ArrayList<>();
+
-		List<Long> zeroOrderIds = new ArrayList<>();
 		List<DistrilbutionBillStockEntity> addBillLadingStock = new ArrayList<>();
 		List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
 		//剩下的计划内就是需要进行取消的
 		//订单新增
 		if (!orderIds.isEmpty()){
+			List<Long> addOrderIds = new ArrayList<>();
+			List<Long> zeroOrderIds = new ArrayList<>();
 			for (Long orderId : orderIds) {
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(orderId);
 				if (Func.isEmpty(stockArticleEntity)){