Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -804,13 +804,15 @@ public class DistributionStockupAppController extends BladeController {
 			);
 			//对指定库存品包件进行库存品ID修改
 			DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(sd -> Func.isEmpty(sd.getStockPackageCode())).collect(Collectors.toList()).get(0);
-			disStockListDetailEntity.setStockListId(stockListEntity.getId());
-			disStockListDetailService.updateById(disStockListDetailEntity);
-			distributionReservationStocklistService.updateById(reservationStocklist);
-			//维护对应库存品的冻结数量
-			DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(reservationStocklist.getStocklistId());
-			oldStockListEntity.setQuantityStock(oldStockListEntity.getQuantityStock() + reservationStocklistEntity.getReservationNum());
-			distributionStockListService.updateById(oldStockListEntity);
+			if (Func.isNotEmpty(disStockListDetailEntity)){
+				disStockListDetailEntity.setStockListId(stockListEntity.getId());
+				disStockListDetailService.updateById(disStockListDetailEntity);
+				distributionReservationStocklistService.updateById(reservationStocklist);
+				//维护对应库存品的冻结数量
+				DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(reservationStocklist.getStocklistId());
+				oldStockListEntity.setQuantityStock(oldStockListEntity.getQuantityStock() + reservationStocklistEntity.getReservationNum());
+				distributionStockListService.updateById(oldStockListEntity);
+			}
 		}
 
  		// 默认 计划数量和实际数量为0

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

@@ -892,7 +892,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(packageId);
 
 		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-		if (stockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){
+		if (stockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
 			List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 				.eq(DistributionParcelListEntity::getStockArticleId, stockArticleEntity.getId()));
 			boolean reservationStatusFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.yiyueyue.getValue()));
@@ -919,16 +919,16 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				}
 			}
 			distributionStockArticleService.updateById(stockArticleEntity);
-		}else {
+		} else {
 			List<DistributionParcelNumberEntity> parcelNumberEntityList = distributionParcelNumberService.list(Wrappers.<DistributionParcelNumberEntity>query().lambda().eq(DistributionParcelNumberEntity::getStockArticleId, stockArticleEntity.getId()));
-			if (Func.isNotEmpty(parcelNumberEntityList)){
-				parcelNumberEntityList.forEach(p->{
+			if (Func.isNotEmpty(parcelNumberEntityList)) {
+				parcelNumberEntityList.forEach(p -> {
 					DistributionParcelListEntity zeroParcelListEntity = distributionParcelListService.getById(p.getParcelListId());
-					if (p.getOutboundQuantity() == p.getQuantity() && p.getOutboundQuantity() > 0){
+					if (p.getOutboundQuantity() == p.getQuantity() && p.getOutboundQuantity() > 0) {
 						//出库数量和总数量一致，此时包件处于装车状态
 						zeroParcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 					}
-					if (p.getOutboundQuantity() == 0 ){
+					if (p.getOutboundQuantity() == 0) {
 						zeroParcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.weizhuancghe.getValue());
 					}
 					distributionParcelListService.updateById(zeroParcelListEntity);
@@ -962,9 +962,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		}
 
 
-
-
-
 	}
 
 	/**
@@ -1284,15 +1281,24 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				.eq(DistributionReservationZeroPackageEntity::getStockArticleId, orderId)
 				.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 			);
-			if (Func.isNotEmpty(reservationZeroPackageEntities)){
+			reservationZeroPackageEntities.forEach(rzp -> {
+					if (rzp.getQuantity() == 0) {
+						rzp.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
+						reservationZeroPackageService.updateById(rzp);
+					}
+				}
+
+			);
+
+			if (Func.isNotEmpty(reservationZeroPackageEntities)) {
 				int sum = reservationZeroPackageEntities.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
 				distributionReservationStockarticle.setReservationNum(sum);
-			}else {
+			} else {
 				distributionReservationStockarticle.setReservationNum(0);
 				distributionReservationStockarticle.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue());
 			}
-			distributionReservationStockarticleMapper.updateById(distributionReservationStockarticle);
 		}
+		distributionReservationStockarticleMapper.updateById(distributionReservationStockarticle);
 		//维护预约的预约数量
 		maintenanceReservationPackageNum(reservationId);
 		maintenanceDeliveryPackageNum(deliveryId);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java

@@ -209,7 +209,6 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 		AtomicInteger retentionTotal = new AtomicInteger();
 		AtomicBoolean saveFlah = new AtomicBoolean(false);
 		warehouseRetentionScanDTOS.forEach(r -> {
-			if (r.getConditions().equals(1)){
 				//查询是否进行多次滞留
 				WarehouseRetentionScanEntity retentionScanServiceOne = warehouseRetentionScanService.getOne(Wrappers.<WarehouseRetentionScanEntity>query().lambda()
 					.eq(WarehouseRetentionScanEntity::getConditions, r.getConditions())
@@ -247,7 +246,6 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 						saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationZeroPackage(r.getDeliveryId(), r.getReservationId(), r.getOrderPackageId(),r.getRetentionQuantity(),r.getOrderId()));
 						break;
 				}
-			}
 			//进行滞留操作的包件需要和原来订单  预约进行绑定解除
 //			reservationClient.retentionCancelReservationPack();
 		});