修改部分数据

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

@@ -4223,6 +4223,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 
 		}
+
 		return distributionParcelListVOS;
 	}
 

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

@@ -413,6 +413,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	 * @return
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public R packageTransferStock(Map<String, Object> distributionParcelList) {
 		Object o = distributionParcelList.get("ids");
 		if(ObjectUtils.isNull(o)){
@@ -432,6 +433,10 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		}
 		queryWrapper.eq("conditions",1);
 		List<DistributionParcelListEntity> list1 = baseMapper.selectList(queryWrapper);
+		boolean b = list1.stream().anyMatch(i -> ObjectUtils.isNull(i.getMaterialId()));
+		if(b){
+			throw new ServiceException("有包件未维护物料信息，请维护后在进行操作！！");
+		}
 		if (!list1.isEmpty()) {
 			Set<Long> listString = new HashSet<>();
 			list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId))
@@ -455,7 +460,12 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 									parcelListEntity.setMaterialCode(vv.get(0).getEncoded());
 									parcelListEntity.setMaterialUnit(vv.get(0).getUnit());
 									// 添加库存品信息
-									addStockList(parcelListEntity, 1);
+									//查询在库订单信息
+									DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId());
+									if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId()) ) {
+										throw new ServiceException("订单的客户数据异常，无法转换！！");
+									}
+									addStockList(distributionStockArticleEntity,parcelListEntity, 1);
 								});
 						}
 						//修改状态
@@ -470,7 +480,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					BeanUtil.copyProperties(v.get(0),parcelListEntity);
 					parcelListEntity.setQuantity(sum);
 					// 添加库存品信息
-					addStockList(parcelListEntity, 1);
+					DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId());
+					if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId()) ) {
+						throw new ServiceException("订单的客户数据异常，无法转换！！");
+					}
+					addStockList(distributionStockArticleEntity,parcelListEntity, 1);
 				});
 			listString.forEach( oo -> {
 				DistributionStockArticleEntity stockArticleEntity1 = distributionStockArticleMapper.selectById(oo);
@@ -566,13 +580,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	 * @return
 	 */
 	@Transactional(rollbackFor = Exception.class)
-	public DistributionStockArticleEntity addStockList(DistributionParcelListEntity distributionParcelList, Integer qu) {
+	public DistributionStockArticleEntity addStockList(DistributionStockArticleEntity distributionStockArticleEntity,DistributionParcelListEntity distributionParcelList, Integer qu) {
+
 
-		//查询在库订单信息
-		DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(distributionParcelList.getStockArticleId());
-		if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId()) ) {
-			throw new ServiceException("订单的客户数据异常，无法转换！！");
-		}
 		DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 		//直接添加
 //		distributionStockListEntity.setIncomingBatch(distributionStockArticleEntity.get); //入库批次号