Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@@ -587,7 +587,7 @@ FROM
 	LEFT JOIN logpm_distribution_reservation_package AS ldrp ON lds.reservation_id = ldrp.reservation_id
 	LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON lwtg.association_id = ldrp.parce_list_id AND lwtg.association_type = 3
 	WHERE
-	lds.delivery_id = #{deliveryListId}
+	lds.delivery_id = #{deliveryListId} and ldr.id is not null
 	GROUP BY ldr.id,lds.loaded_number,lds.loadedin_number,lds.received_quantity,lds.receivedin_quantity,ldsk.stockup_area,ldrs.reservation_num
     </select>
     <select id="selectDistributionAppDeliveryInventoryPage"

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

@@ -2515,6 +2515,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		for (DistributionAppReservationVO distributionAppReservationVO : customList) {
 			List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = localFindReservationStockarticleEntityLists(reservationStockarticleEntityLists,distributionAppReservationVO.getId());
 
+			log.info(">>>>>>>>>> reservationStockarticleEntityList ={}",reservationStockarticleEntityList.size());
 
 			List<DistributionStockEntity> distributionStockEntities = new ArrayList<>();
 			List<DistributionLoadscanEntity> loadscanEntityList = new ArrayList<>();
@@ -2620,12 +2621,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	private List<DistributionParcelListEntity> localFindAllParcelListEntities(List<DistributionParcelListEntity> allParcelListEntities,  Long stockArticleId) {
 		List<DistributionParcelListEntity> temp = new ArrayList<>();
-		allParcelListEntities.forEach(t->{
-			if(t.getStockArticleId().equals(stockArticleId)){
-				temp.add(t);
-			}
-		});
 
+		for (DistributionParcelListEntity allParcelListEntity : allParcelListEntities) {
+			if(allParcelListEntity.getStockArticleId().equals(stockArticleId)){
+				temp.add(allParcelListEntity);
+			}
+		}
 		return temp;
 	}
 
@@ -2637,11 +2638,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	 */
 	private List<DistributionReservationStockarticleEntity> localFindReservationStockarticleEntityLists(List<DistributionReservationStockarticleEntity> reservationStockarticleEntityLists, Long id) {
 		List<DistributionReservationStockarticleEntity> temp = new ArrayList<>();
-		reservationStockarticleEntityLists.forEach(t->{
+
-			if(t.getReservationId().equals(id)){
+		for (DistributionReservationStockarticleEntity reservationStockarticleEntityList : reservationStockarticleEntityLists) {
-				temp.add(t);
+			if(reservationStockarticleEntityList.getReservationId().equals(id)){
+				temp.add(reservationStockarticleEntityList);
 			}
-		});
+		}
+
 		return temp;
 	}