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

blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java

@@ -99,6 +99,13 @@ public class OldSystemDataPushConfig {
 
 		//兴义仓
 		warehourseIds.add("155");
+
+		//新都仓
+		warehourseIds.add("144");
+
+		//仁寿欧派大家居
+		warehourseIds.add("127");
+
 	}
 
 

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

@@ -365,7 +365,7 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 					.eq(DistributionReservationZeroPackageEntity::getStockArticleId, orderId)
 					.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 				);
-				if (!reservationZeroPackageEntities.isEmpty()) {
+				if (reservationZeroPackageEntities.isEmpty()) {
 					//需要取消的订单
 					cancelBillOrderIds.add(orderId);
 				}