Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -372,10 +372,10 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 				}
 			}
 		}
-		if (!orderIds.isEmpty()) {
+		if (!cancelBillOrderIds.isEmpty()) {
 			//存在需要进行取消的订单
 			this.update(Wrappers.<DistrilbutionBillStockEntity>update().lambda()
-				.in(DistrilbutionBillStockEntity::getStockArticleId,orderIds)
+				.in(DistrilbutionBillStockEntity::getStockArticleId,cancelBillOrderIds)
 				.eq(DistrilbutionBillStockEntity::getBillLadingId,billId)
 				.set(DistrilbutionBillStockEntity::getOrderStatus, ReservationOrderStatusConstant.quxiao.getValue())
 			);