修复取消配送已装车不能取消BUG

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

@@ -188,6 +188,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionStockArticleVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPage(page, distributionStockArticle);
 		List<DistributionLoadscanEntity> loadList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 			.eq(DistributionLoadscanEntity::getDeliveryId, distributionStockArticle.get("deliveryId"))
+			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 		);
 		Map<Long, List<DistributionLoadscanEntity>> orderLoadMap;
 		if (!Objects.isNull(loadList)) {
@@ -249,6 +250,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionStockArticleVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPageByDeliveryId(Long.parseLong(deliveryId));
 		List<DistributionLoadscanEntity> loadList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 			.eq(DistributionLoadscanEntity::getDeliveryId, distributionStockArticle.get("deliveryId"))
+			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 		);
 		Map<Long, List<DistributionLoadscanEntity>> orderLoadMap;
 		if (!Objects.isNull(loadList)) {

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

@@ -7130,12 +7130,28 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			log.info(method + "存在装车数据:{}", reservationCodes);
 			return R.fail(deliveryListEntity.getTrainNumber() + "存在装车包件!!!");
 		}
-		//该配送是否存在异常装车或者异常签收数据
-		List<DistributionLoadscanEntity> loadscanEntityList = distributionDeliveryListService.selectAbnormalLoadingBydeliveryId(deliveryId);
-		if (Func.isNotEmpty(loadscanEntityList)) {
-			log.info(method + "存在异常装车数据:{}", deliveryId);
-			return R.fail(reservationCodes + "存在异常装车、签收包条!!!");
+		List<Long> ids = reservationEntities.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList());
+
+		List<DistributionLoadscanEntity> packageList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+			.eq(DistributionLoadscanEntity::getReservationId, ids)
+			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+		);
+		List<DistributionLoadscaninvnEntity> inventoryList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda()
+			.eq(DistributionLoadscaninvnEntity::getReservationId, ids)
+			.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+		);
+		if (!packageList.isEmpty() || !inventoryList.isEmpty()){
+			log.info(method + "取消配送存在装车数据:{}", deliveryId);
+			return R.fail(reservationCodes + "存在装车、签收数据!!!");
 		}
+
+
+//		//该配送是否存在异常装车或者异常签收数据
+//		List<DistributionLoadscanEntity> loadscanEntityList = distributionDeliveryListService.selectAbnormalLoadingBydeliveryId(deliveryId);
+//		if (Func.isNotEmpty(loadscanEntityList)) {
+//			log.info(method + "存在异常装车数据:{}", deliveryId);
+//			return R.fail(reservationCodes + "存在异常装车、签收包条!!!");
+//		}
 		boolean flag = false;
 		for (DistributionReservationEntity reservationEntity : reservationEntities) {
 			DistributionReservationDTO reservationDTO = Func.copy(reservationEntity, DistributionReservationDTO.class);

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

@@ -2732,8 +2732,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		List<WarehouseTrayGoodsEntity> trayGoodsEntities = warehouseTrayGoodsClient.findZeroByOrderCode(stockArticleEntity.getOrderCode(),stockArticleEntity.getWarehouseId());
 		List<Map<String,Object>> trayMapList = new ArrayList<>();
 		if (!trayGoodsEntities.isEmpty()) {
-			int sum = trayGoodsEntities.stream().mapToInt(WarehouseTrayGoodsEntity::getNum).sum();
-			handQuantity = handQuantity - sum;
+//			int sum = trayGoodsEntities.stream().mapToInt(WarehouseTrayGoodsEntity::getNum).sum();
 			Iterator<WarehouseTrayGoodsEntity> iterator = trayGoodsEntities.iterator();
 			while (iterator.hasNext()){
 				//查询是否进行上架
@@ -2741,6 +2740,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				if (Func.isNotEmpty(warehouseTaryAllocationClient.findAllocationByTrayId(next.getTrayId()))){
 					iterator.remove();
 				}else {
+					handQuantity = handQuantity - next.getNum();
+
 					//查询托盘名称
 					BasicdataTrayEntity trayByTrayCode = basicdataTrayClient.getTrayByTrayCode(next.getTrayCode());
 					Map<String,Object> map = new HashMap<>();