自提备货BUG修复

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

@@ -1089,10 +1089,10 @@
         SELECT COUNT(*)
         FROM logpm_distrilbution_bill_package dp
         WHERE dp.stock_article_id = ldbs.stock_article_id and dp.packet_bar_status in (1,3) and dp.packet_bar_code is
-        not null
+        not null AND dp.bill_lading_id = ldsi.reservation_id
         ) AS reservationNum
         from logpm_distribution_stockup_info ldsi
-        LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id and ldbs.order_status in (1,2)
+        LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id and ldbs.order_status in (1,3)
         LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldbs.stock_article_id
         INNER JOIN logpm_distribution_stockup lds ON lds.id = ldsi.stockup_id
         <where>

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

@@ -693,7 +693,7 @@
                  LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldbp.parce_list_id
                  LEFT JOIN logpm_distribution_stock_article dsa ON dbl.stock_article_id = dsa.id
                  LEFT JOIN logpm_distribution_stockup_info ldsi on dbl.id = ldsi.reservation_id and  ldsi.stock_up_type = #{distrilbutionBillLading.stockupType}
-        where ldsi.stockup_id = #{distrilbutionBillLading.id};
+        where ldsi.stockup_id = #{distrilbutionBillLading.id} AND dbp.packet_bar_status != 2
     </select>
     <select id="selectBillLadingPackage"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">