1.修改查询

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

@@ -2902,10 +2902,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
 							List<DistributionParcelListDTO> packageListInfo = s.getPackageListInfo();
 							DistributionReservationPackageEntity reservationPackageEntity1 = distributionReservationPackageService.getById("1717072702285783041");
+							log.info("reservationEntity.getId()>>>>>>>>{}", reservationEntity.getId());
+							log.info("s.getId()>>>>>>>>{}",s.getId());
 							List<DistributionReservationPackageEntity> list = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda()
 								.eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
 								.eq(DistributionReservationPackageEntity::getStockArticleId, s.getId())
-								.apply("packet_bar_status != '2' "));
+								.apply("packet_bar_status != '2' ")
+							);
+							List<DistributionReservationPackageEntity> distributionReservationPackageEntities = distributionReservationPackageMapper.selectList(new QueryWrapper<DistributionReservationPackageEntity>().lambda()
+								.eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
+								.eq(DistributionReservationPackageEntity::getStockArticleId,  s.getId())
+								.ne(DistributionReservationPackageEntity::getPacketBarCode, "2")
+							);
+//
 							List<DistributionReservationPackageEntity> byReservationIdAndStockArticleId = distributionReservationPackageMapper.getByReservationIdAndStockArticleId(reservationEntity.getId(), s.getId());
 
 							Map<Long, List<DistributionReservationPackageEntity>> oldPackageList =list.stream().collect(Collectors.groupingBy(DistributionReservationPackageEntity::getParceListId));

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

@@ -982,6 +982,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		//查询订单下的所有包条
 		List<DistributionParcelListEntity>  distributionParcelListEntitys =	distributionParcelListMapper.selectListByOderId(id,collect);
 		//查询订单下的所有库存品
+		//List<DistributionStockListVO>  distributionStockListVOS =	distributionParcelListMapper.selectStockListByOderId(id,collect);
 	   queryOrderVO.setWrapNum(distributionParcelListEntitys.size());
 	   queryOrderVO.setInventoryNum(0);
 		queryOrderVO.setList(distributionParcelListEntitys);