From 95d517fce683aff7501cc291ce2185d20c6525ec Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 19 Jun 2024 16:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E4=BB=BB=E5=8A=A1=E5=8F=96=E6=B6=88=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionParcelListMapper.xml   | 2 +-
 .../distribution/mapper/DistributionStockupMapper.xml      | 1 +
 .../service/impl/DistributionReservationServiceImpl.java   | 7 ++++++-
 .../service/impl/DistributionStockupServiceImpl.java       | 2 --
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 2187fab27..51a2f17be 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -543,7 +543,7 @@
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3'
         LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
         <where>
-            ldsi.stockup_id =#{id} and ldpl.order_package_code is not null and ldsi.stock_status != 4
+            ldsi.stockup_id =#{id} and ldpl.order_package_code is not null and ldsi.stock_status != 4 AND ldrp.packet_bar_status != 2
         </where>
     </select>
     <select id="getPageVOList" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 1916c8247..b74331657 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -1020,6 +1020,7 @@
             ldsi.stockup_id = #{ id }
             AND ldsi.is_deleted = 0
             AND ldsi.stock_status != 4
+            AND ldrs.stock_article_status != 2
         </where>
 
     </select>
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 5e9417e21..7a855d819 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
@@ -2589,7 +2589,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			//查询备货任务
 			DistributionStockupEntity stockupEntity = distributionStockupMapper.selectById(distributionStockupInfoEntities.get(0).getStockupId());
 			if (Func.isNotEmpty(stockupEntity)) {
-				if (stockupEntity.getAssignStatus().equals(StockAssignStatusConstant.weizhipai.getValue())) {
+				//查询此备货任务有多少
+				List<DistributionStockupInfoEntity> entityList = distributionStockupInfoService.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.eq(DistributionStockupInfoEntity::getStockupId, stockupEntity.getId())
+					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
+				);
+				if (stockupEntity.getAssignStatus().equals(StockAssignStatusConstant.weizhipai.getValue()) && entityList.size() == 1) {
 					//物理删除关于预约的所有信息
 					distributionReservationStocklistMapper.deleteReservationStocklist(reservationEntity.getId());
 					distributionReservationPackageMapper.deleteReservationPackage(reservationEntity.getId());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 4453a3551..0759a43b9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -310,8 +310,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			//商  市
 			return baseMapper.pageList(page, distributionStockupEntity);
 		}
-
-
 	}
 
 	@Override