Merge branch 'dev' into pre-production

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

@@ -127,6 +127,7 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm
 				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 				distributionParcelListMapper.updateById(parcelListEntity);
 			}
+			distributionParcelNumberEntity.setDeliveryQuantity(i);
 			distributionParcelNumberService.updateById(distributionParcelNumberEntity);
 			reservationZeroPackageEntity.setQuantity(0);
 			reservationZeroPackageEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());

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

@@ -1938,16 +1938,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							);
 						}
 					}
-
-
 				}
 				distrilbutionBillStock.setOrderStatus("2");
 				distrilbutionBillStockService.updateById(distrilbutionBillStock);
 				orderCodes.add(stockArticleEntity.getOrderCode());
 			}
-
 		}
-
 		List<DistrilbutionBillStockEntity> addBillLadingStock = new ArrayList<>();
 		List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
 		//剩下的计划内就是需要进行取消的