一件装车状态维护

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java

@@ -201,9 +201,9 @@ public interface IDistributionAsyncService {
 
 	/**
 	 * 维护包件、订单装车和出库状态
-	 * @param parcelListEntity
+	 * @param packageId
 	 */
-	void checkOrderLoadingStatus(DistributionParcelListEntity parcelListEntity);
+	void checkOrderLoadingStatus(Long packageId);
 
 	/**
 	 * 维护包件、订单预约状态

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

@@ -864,20 +864,22 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	}
 
 	@Override
-	public void checkOrderLoadingStatus(DistributionParcelListEntity parcelListEntity) {
-		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
-			.eq(DistributionParcelListEntity::getStockArticleId, parcelListEntity.getStockArticleId()));
-		boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-		if (flag){
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-		}else {
-			 flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-			 if (!flag){
-				 stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-			 }
+	public void checkOrderLoadingStatus(Long packageId) {
+		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(packageId);
+		parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
+		distributionParcelListService.updateById(parcelListEntity);
+		if (Func.isNotEmpty(parcelListEntity)){
+			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
+			Integer orderLoadingNum = distributionLoadscanMapper.selectOrderLoadingNum(stockArticleEntity.getId());
+			if (Func.isNotEmpty(orderLoadingNum) && orderLoadingNum > 0){
+				if (stockArticleEntity.getTotalNumber() ==orderLoadingNum ){
+					stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
+				}else {
+					stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
+				}
+				distributionStockArticleService.updateById(stockArticleEntity);
+			}
 		}
-		distributionStockArticleService.updateById(stockArticleEntity);
 	}
 
 	@Override

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

@@ -1389,6 +1389,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		//查询配送任务配车司机信息
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+		distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
+		distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
 		DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfDTO();
 		if (StringUtils.isBlank(distrilbutionloadingscanDTO.getLoadingId())) {
 			if (distributionDeliveryListEntity.getKind().equals("1")) {
@@ -1496,6 +1498,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 								Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
 								warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
+								distributionAsyncService.checkOrderLoadingStatus(parcelListEntity.getId());
 							}
 							//异步修改包件状态
 //							distributionAsyncService.changeMarketDeliveryListStatus(loadscanEntity.getOrderPackageCode(), loadscanEntity.getDeliveryId());
@@ -5017,7 +5020,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//更新签收表的装车数量
 			Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
 			//异步维护此异常装车包件的订单状态
-			distributionAsyncService.checkOrderLoadingStatus(parcelListEntity);
+			distributionAsyncService.checkOrderLoadingStatus(parcelListEntity.getId());
 			DistributionSignforEntity signforEntity = distributionSignforService.getOne(Wrappers.<DistributionSignforEntity>query().lambda()
 				.eq(DistributionSignforEntity::getReservationId, reservationEntity.getId())
 				.eq(DistributionSignforEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()));