Merge branch 'dev' into pre-production

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

@@ -14,6 +14,7 @@
           ldsa.is_deleted = 0
           and ldsa.order_status in ('10','20','30','40','50','60','70')
           and ldsa.hand_quantity > 0
+          AND ldpl.order_package_status = 20
         <if test="param.orderCodeNumList != null">
             and ldsa.order_code in
             <foreach collection="param.orderCodeNumList" separator="," close=")" item="a" open="(">