Merge branch 'dev' into pre-production

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

@@ -1610,9 +1610,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					//在库数量
 					inWarehouseQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getHandQuantity).sum();
 					deliveryQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getDeliveryQuantity).sum();
-
-
 					loadingQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getOutboundQuantity).sum();
+					signingQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getSigninQuantity).sum();
+					log.info("############维护零担数量deliveryQuantity:{}",deliveryQuantity);
+					log.info("############维护零担数量loadingQuantity:{}",loadingQuantity);
+					log.info("############维护零担数量inWarehouseQuantity:{}",inWarehouseQuantity);
+					log.info("############维护零担数量signingQuantity:{}",signingQuantity);
+					log.info("############维护零担数量TotalNumber:{}",stockArticleEntity.getTotalNumber());
 					if (stockArticleEntity.getTotalNumber() == loadingQuantity) {
 						//此时的出库和总数一致，该零担此时全部进行出库
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
@@ -1627,7 +1631,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					}else if ((loadingQuantity + deliveryQuantity) > 0){
 						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
 					}
-					signingQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getSigninQuantity).sum();
 					if (stockArticleEntity.getTotalNumber() == signingQuantity) {
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
 					} else if (stockArticleEntity.getTotalNumber() > signingQuantity) {