Merge branch 'dev' into pre-production

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

@@ -1624,6 +1624,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					if ((loadingQuantity + deliveryQuantity) == stockArticleEntity.getTotalNumber()) {
 						//无在库数量则无法进行预约
 						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+					}else if ((loadingQuantity + deliveryQuantity) > 0){
+						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
 					}
 					signingQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getSigninQuantity).sum();
 					if (stockArticleEntity.getTotalNumber() == signingQuantity) {