From 98128a67da50afa902a4c923e11738f31e878bad Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 7 Feb 2025 17:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E5=A4=87=E8=B4=A7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionAsyncServiceImpl.java     | 10 ++++++++++
 .../service/impl/DistributionStockupServiceImpl.java   |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index dd404c8f4..3f2be4e7c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -1355,11 +1355,21 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda()
 					.eq(DistributionLoadscanEntity::getReservationId, reservationId)
 					.in(DistributionLoadscanEntity::getPackageId, packageIds)
+					.eq(DistributionLoadscanEntity::getSignforState, 2)
 					.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 				);
 				for (DistributionParcelNumberDTO distributionParcelNumberDTO : distributionParcelNumberDTOS) {
 					//判断是全部进行返回还是部分
+					if (!loadscanEntityList.isEmpty()) {
+						//需要比对此品类是否存在签收数据
+						List<DistributionLoadscanEntity> zeroLoading = loadscanEntityList.stream().filter(f -> f.getPackageId().equals(distributionParcelNumberDTO.getParcelListId())).collect(Collectors.toList());
+						if (!zeroLoading.isEmpty()) {
+							//存在签收数据，进行部分释放
+						}
+					}else {
+						//进行全部释放
 
+					}
 				}
 				if (Func.isNotEmpty(loadscanEntityList)) {
 					//查看是否存在需要进行回库的零担
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 146b4ce5c..616d965aa 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
@@ -5216,6 +5216,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			}
 		}
 
+		DistributionParcelListEntity parcelListEntity1 = new DistributionParcelListEntity();
+		parcelListEntity1.setId(parcelListEntity.getId());
+		parcelListEntity1.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
+		distributionParcelListService.updateById(parcelListEntity1);
 		//进行下架
 		warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "备货包件下架");
 		List<JSONObject> logList = new ArrayList<>();