Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1216,6 +1216,7 @@
         where 1=1
           and ldrp.reservation_id = #{reservationId}
           and ldrp.stock_article_id = #{stockArticleId}
+          and ldrp.packet_bar_status in (1,3)
         group by ldpl.material_name
     </select>
 
@@ -1230,6 +1231,7 @@
         where 1=1
           and ldrp.reservation_id = #{reservationId}
           and ldrp.stock_article_id = #{stockArticleId}
+          and ldrp.packet_bar_status in (1,3)
         group by IFNULL(ldpl.third_product,'其他')
     </select>
     <select id="selectOrderInfoByReservationId"