市配增加包件中转限制

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

@@ -897,7 +897,7 @@
         FROM logpm_distribution_stock_article AS ldsa
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id
-        WHERE ldsa.id = #{stockArticleId}
+        WHERE ldsa.id = #{stockArticleId} AND ldpl.is_transfer = 0
     </select>
     <select id="exportDistributionStockArticle"
             resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
@@ -1197,10 +1197,10 @@
         WHERE
         ldpl.order_package_reservation_status = 10
         and ldpl.conditions != 2
+        and ldpl.is_transfer = 0
         and ldpl.order_package_freeze_status = 10
         AND ldpl.order_package_loading_status = 10 AND order_package_status IN (10,20)
         and ldpl.stock_article_id = #{param.id} and ldpl.warehouse_id = #{warehouseId}
-        and ldpl.conditions !=2
         <if test="param.waybillNumber != null and param.waybillNumber != ''">
             and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
         </if>

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

@@ -1489,6 +1489,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
 							.ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue())
 							.eq(DistributionParcelListEntity::getConditions, 1)
+							.eq(DistributionParcelListEntity::getIsTransfer, 0)
 							.notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()}));
 						distributionParcelListEntities.forEach(dp -> {
 							if (!dp.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
@@ -2947,6 +2948,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
 							.ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue())
 							.eq(DistributionParcelListEntity::getConditions, 1)
+							.eq(DistributionParcelListEntity::getIsTransfer, 0)
 							.notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()}));
 						if (Func.isEmpty(distributionParcelListEntities)) {
 							log.error("#########################无可用包件,订单ID为‘；:{}", s.getId());
@@ -2981,6 +2983,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 
 						});
 					} else {
+
 						//维护选中的包件信息
 						List<Long> packageIds = packageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 						packageLockIds.addAll(packageIds);