Merge branch 'dev' into pre-production

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

@@ -1625,17 +1625,30 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					} else {
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
 					}
-					if ((loadingQuantity + deliveryQuantity) == stockArticleEntity.getTotalNumber()) {
-						//无在库数量则无法进行预约
-						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
-					}else if ((loadingQuantity + deliveryQuantity) > 0){
-						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+					if ((loadingQuantity + deliveryQuantity) == 0){
+						if (stockArticleEntity.getTotalNumber() == inWarehouseQuantity){
+							stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
+						}else if (inWarehouseQuantity > 0){
+							stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
+						}
+					}else {
+						if ((loadingQuantity + deliveryQuantity) == stockArticleEntity.getTotalNumber()) {
+							//无在库数量则无法进行预约
+							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+						}else if ((loadingQuantity + deliveryQuantity) > 0){
+							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+						}
 					}
-					if (stockArticleEntity.getTotalNumber() == signingQuantity) {
-						stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
-					} else if (stockArticleEntity.getTotalNumber() > signingQuantity) {
-						stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
+					if (signingQuantity == 0){
+						stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
+					}else {
+						if (stockArticleEntity.getTotalNumber() == signingQuantity) {
+							stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
+						} else if (stockArticleEntity.getTotalNumber() > signingQuantity) {
+							stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
+						}
 					}
+
 					//维护订单的在库件数
 					stockArticleEntity.setHandQuantity(inWarehouseQuantity);
 					//维护订单的配送件数