取消自提零担订单BUG修复

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

@@ -2943,6 +2943,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	}
 
 	@Override
+	@Transactional
 	public void maintenanceCancelBillLading(List<Long> ids) {
 		List<Long> orderIds = new ArrayList<>();
 		List<Long> packageIds = new ArrayList<>();
@@ -2971,7 +2972,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					reservationZeroPackageEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
 					Integer quantity = reservationZeroPackageEntity.getQuantity();
 					distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda()
-						.setSql("delivery_quantity -", quantity)
+						.setSql("delivery_quantity = delivery_quantity - "+quantity)
 						.eq(DistributionParcelNumberEntity::getParcelListId,reservationZeroPackageEntity.getParcelListId())
 						.eq(DistributionParcelNumberEntity::getStockArticleId,reservationZeroPackageEntity.getStockArticleId())
 					);

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

@@ -2211,6 +2211,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 						}
 
 					}
+					if (deliveryQuantity == 0){
+						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+					}
 					if (signingQuantity == 0) {
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
 					} else {