From 93e2fc95c62598a6d95ba214c53e7e07d8d98039 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 20 Aug 2024 17:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E5=A2=9E=E5=8A=A0=E5=8C=85?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E8=BD=AC=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml    | 4 ++--
 .../service/impl/DistributionReservationServiceImpl.java      | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index f197e6fb0..4aa8dcb0f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/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>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 6fba031a4..3e97fc861 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/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);