Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java

@@ -21,7 +21,7 @@ public class BillLadingAppDTO implements Serializable {
 	private Integer orderStatus;//订单状态
 
 	private Long billLadingId;//自提单id
-	private Long stockArticleId;//自提单id
+	private Long stockArtieleld;//自提单id
 
 	private Integer scanStatus;//扫码类型
 

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

@@ -73,7 +73,7 @@
         LEFT JOIN logpm_distrilbution_bill_stock AS  lds on lds.bill_lading_id = dbl.id
         LEFT JOIN logpm_distribution_stock_article dsa on lds.stock_article_id = dsa.id
         <where>
-            dbl.is_deleted = 0
+            dbl.is_deleted = 0 AND lds.order_status != 2
             <if test="param.serviceNumber != null and param.serviceNumber != ''">and dsa.service_number like
                 concat('%',#{param.serviceNumber},'%')
             </if>

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

@@ -2766,7 +2766,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		List<DistributionReservationZeroPackageEntity> list = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
 			.eq(DistributionReservationZeroPackageEntity::getReservationId, billLadingAppDTO.getBillLadingId())
 			.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
-			.eq(DistributionReservationZeroPackageEntity::getStockArticleId, billLadingAppDTO.getStockArticleId())
+			.eq(DistributionReservationZeroPackageEntity::getStockArticleId, billLadingAppDTO.getStockArtieleld())
 			.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3")
 		);
 		List<DistrilbutionAppBillLadingZeroVO> parcelListEntityList = new ArrayList<>();