Merge branch 'pre-production'

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

@@ -217,15 +217,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			if(dis.getKind().equals("1")){
 				//z自
 				List<DistributionDeliverySelfEntity> list1 = distributionDeliverySelfService.list(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, dis.getId()));
-				String collect = list1.stream().map(DistributionDeliverySelfEntity::getDriverName).collect(Collectors.joining());
-				String colle = list1.stream().map(DistributionDeliverySelfEntity::getVehicleNub).collect(Collectors.joining());
+				String collect = list1.stream().map(DistributionDeliverySelfEntity::getDriverName).collect(Collectors.joining(","));
+				String colle = list1.stream().map(DistributionDeliverySelfEntity::getVehicleNub).collect(Collectors.joining(","));
 				deliveryListExcel.setDriver(collect);
 				deliveryListExcel.setVehicle(colle);
 			}else{
 				//三
 				List<DistributionDeliveryTripartiteEntity> list1 = distributionDeliveryTripartiteService.list(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, dis.getId()));
-				String collect = list1.stream().map(DistributionDeliveryTripartiteEntity::getDriverName).collect(Collectors.joining());
-				String colle = list1.stream().map(DistributionDeliveryTripartiteEntity::getVehicleNum).collect(Collectors.joining());
+				String collect = list1.stream().map(DistributionDeliveryTripartiteEntity::getDriverName).collect(Collectors.joining(","));
+				String colle = list1.stream().map(DistributionDeliveryTripartiteEntity::getVehicleNum).collect(Collectors.joining(","));
 				deliveryListExcel.setDriver(collect);
 				deliveryListExcel.setVehicle(colle);
 			}

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

@@ -487,11 +487,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //			return null;
 //		}
 		List<Long> orderIds = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
-		List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.listByIds(orderIds);
-		List<DistributionSignPrintVO> printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId());
-		distributionSignforVO.setPrintVOList(printEntities);
-		if (Func.isNotEmpty(stockArticleEntities)) {
-			distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities));
+		if (Func.isNotEmpty(orderIds)){
+			List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.listByIds(orderIds);
+			List<DistributionSignPrintVO> printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId());
+			distributionSignforVO.setPrintVOList(printEntities);
+			if (Func.isNotEmpty(stockArticleEntities)) {
+				distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities));
+			}
 		}
 //		List<DistributionStockArticleVO> stockArticleEntityList = baseMapper.selectOrderList(id);
 		return distributionSignforVO;

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

@@ -1755,26 +1755,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			}
 		});
 		if (stock.get()) {
-			return Resp.scanFail("备货失败", "备货失败！");
+			return Resp.scanFail("备货失败！有其他包件无法整托", "备货失败！有其他包件无法整托");
 		} else {
 			List<DistributionStockEntity> list1 = new ArrayList<>();
-			String collect = voList.stream().map(DistributionStockPackageVO::getPacketBarCode).collect(Collectors.joining(","));
-			Long warehouseId ;
-			if(one.getStockUpType().equals("3")){
-				DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = distrilbutionBillLadingMapper.selectById(stockupDTO.getReservationId());
-				warehouseId = distrilbutionBillLadingEntity.getWarehouseId();
-			}else{
-				DistributionReservationEntity byId1 = distributionReservationService.getById(stockupDTO.getReservationId());
-				warehouseId = byId1.getWarehouseId();
-			}
-			if(ObjectUtils.isNull(warehouseId)){
-				throw new ServiceException("预约信息不存在，无法备货！");
-			}
-			//货位下架
-			R r = warehouseUpdownTypeClient.downPackage(collect,warehouseId );
-			if(r.getCode() != 200){
-				throw new ServiceException("下架失败！！");
-			}
 			voList.forEach(i -> {
 				//查询是否已备货
 				DistributionParcelListEntity byId = distributionParcelListService.getById(i.getParcelListId());
@@ -1820,11 +1803,28 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					distributionStock.setType(1);
 //					distributionStock.setDeliveryListCode(i.getNoteNumber());
 //					distributionStock.setDeliveryListId(i.getDeliveryId());
-
+					distributionStock.setStockQuantity(1);
 					distributionStock.setCoding(i.getPacketBarCode());
 					list1.add(distributionStock);
 				}
 			});
+			String collect = voList.stream().map(DistributionStockPackageVO::getPacketBarCode).collect(Collectors.joining(","));
+			Long warehouseId ;
+			if(one.getStockUpType().equals("3")){
+				DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = distrilbutionBillLadingMapper.selectById(stockupDTO.getReservationId());
+				warehouseId = distrilbutionBillLadingEntity.getWarehouseId();
+			}else{
+				DistributionReservationEntity byId1 = distributionReservationService.getById(stockupDTO.getReservationId());
+				warehouseId = byId1.getWarehouseId();
+			}
+			if(ObjectUtils.isNull(warehouseId)){
+				throw new ServiceException("预约信息不存在，无法备货！");
+			}
+			//货位下架
+			R r = warehouseUpdownTypeClient.downPackage(collect,warehouseId );
+			if(r.getCode() != 200){
+				throw new ServiceException("下架失败！！");
+			}
 			//TODO 其他操作
 			//添加扫描记录