Merge branch 'dev' into pre-production

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

@@ -629,6 +629,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		// 品牌
 		distributionStockListEntity.setBrandId(Optional.ofNullable(distributionParcelList.getBrandId()).orElse(null));
 		distributionStockListEntity.setUnpackingQuantity(0);
+		distributionStockListEntity.setSourceType("1"); //类型
 
 		BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(distributionParcelList.getMaterialId());
 		distributionStockListEntity.setSku(materialOwnId.getSku());
@@ -636,7 +637,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		distributionStockListEntity.setParcelListId(distributionParcelList.getId());//包件id
 		distributionStockListEntity.setQuantityOccupied(0);//冻结数量
 		distributionStockListEntity.setServiceType(distributionStockArticleEntity.getTypeService());//冻结数量
-		DistributionStockListEntity stockListEntity = distributionStockListService.getStockListEntity(distributionStockArticleEntity.getMallId(), distributionParcelList.getMaterialId(), distributionStockArticleEntity.getWaybillNumber(),distributionStockArticleEntity.getStoreId(),distributionStockArticleEntity.getWarehouseId());
+		DistributionStockListEntity stockListEntity = distributionStockListService.getStockListEntity(distributionStockArticleEntity.getMallId(), distributionParcelList.getMaterialId(), distributionStockArticleEntity.getOrderCode(),distributionStockArticleEntity.getStoreId(),distributionStockArticleEntity.getWarehouseId());
 		if(ObjectUtils.isNotNull(stockListEntity)){
 			//有记录
 			DistributionStockListEntity listEntity = new DistributionStockListEntity();
@@ -654,7 +655,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		distributionStockListEntity.setDespatch(Optional.ofNullable(distributionStockArticleEntity.getTrainNumber()).orElse(null));//车次号
 		distributionStockListEntity.setStockArticleId(Optional.ofNullable(distributionParcelList.getStockArticleId()).orElse(null)); //订单ID
 		distributionStockListEntity.setOrderCode(Optional.ofNullable(distributionStockArticleEntity.getOrderCode()).orElse(null)); //订单自编号
-		distributionStockListEntity.setSourceType("1"); //订单自编号
+
 		//添加库存品记录
 		DistributionStockListInfoEntity distributionStockListInfo = new DistributionStockListInfoEntity();
 		BeanUtil.copyProperties(distributionStockListEntity,distributionStockListInfo);