Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java

@@ -78,7 +78,7 @@ public class DistributionStockArticleExcel implements Serializable {
 	 * 仓库
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("仓库")
+	@ExcelProperty("所在仓库")
 	private String warehouse;
 	/**
 	 * 仓库

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

@@ -337,7 +337,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param conditions
 	 * @return
 	 */
-    boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions);
+	boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions);
 
 	/**
 	 * 滞留取消库存品包件

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

@@ -734,7 +734,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				if (shangpeiFlag) {
 					List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee()) && r.getConsignee().equals(stockArticleEntity.getCustomerName()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getMallName().equals(stockArticleEntity.getMallName())).collect(Collectors.toList());
 					//查看是否存在满足条件的预约单
-					if (reservationEntities.size() == 1) {
+					//存在多个，操作人指定具体客户即可
+					if (!reservationEntities.isEmpty()) {
 						if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())) {
 							log.info("异常装车未指定客户");
 							return Resp.scanFail("请指定客户进行异常装车", "请指定客户进行异常装车");

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

@@ -501,6 +501,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		}
 		queryWrapper.eq("conditions", 1);
 		List<DistributionParcelListEntity> list1 = baseMapper.selectList(queryWrapper);
+		boolean flag = list1.stream().anyMatch(p -> OrderPackageReservationStatusConstant.yiyueyue.getValue().equals(p.getOrderPackageReservationStatus()));
+		if (flag){
+			String collect = list1.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));
+			throw new ServiceException(collect+"包件已预约,无法转为库存品");
+		}
 		boolean b = list1.stream().anyMatch(i -> ObjectUtils.isNull(i.getMaterialId()));
 		if (b) {
 			throw new ServiceException("有包件未维护物料信息，请维护后在进行操作！！");

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

@@ -191,8 +191,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					distributionStockArticleVO.getTotalNumber() - distributionStockArticleVO.getIncomingNum()
 				);
 			}
-			excel.setIsZeroString("1".equals(distributionStockArticleVO.getIsZero()) ? "是" : "否");
 			BeanUtil.copyProperties(distributionStockArticleVO, excel);
+			excel.setIsZeroString("1".equals(distributionStockArticleVO.getIsZero()) ? "是" : "否");
 			excelList.add(excel);
 		});
 

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

@@ -261,6 +261,7 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 	}
 
 	@Override
+	@Transactional
 	public R updateRetentionList(WarehouseRetentionRecordDTO warehouseRetentionScanDTOS) {
 		// 获取当前登录的仓库信息
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();