From 50e3f2e4404a7586169dd1f9e2c3a7ce875461e5 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 5 Jan 2024 18:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 471679cc0..3a711b228 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -1213,6 +1213,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("PC签收缺失包件码参数");
 			return R.fail("请联系管理员!!!");
 		}
+		List<String> orderpackages = new ArrayList<>();
 		for (String orderPackageCode : orderPackageCodes) {
 			List<DistributionParcelListEntity> collect = parcelListEntityList.stream().filter(p -> p.getOrderPackageCode().equals(orderPackageCode)).collect(Collectors.toList());
 			if (Func.isNotEmpty(collect) && collect.size() == 1) {
@@ -1323,8 +1324,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 					//更新签收人
 					Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
-					//包件解托下架
-					warehouseUpdownTypeClient.downPackageOrDelTray(collect.get(0).getOrderPackageCode(), myCurrentWarehouse.getId());
+//					包件解托下架
+//					warehouseUpdownTypeClient.downPackageOrDelTray(collect.get(0).getOrderPackageCode(), myCurrentWarehouse.getId());
 				}
 				//修改包件状态为装车、签收
 				DistributionParcelListEntity updatePackage = collect.get(0);
@@ -1335,18 +1336,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionStockArticleService.maintenanceOrderInfo(collect.get(0).getOrderCode(),myCurrentWarehouse.getId());
 				//推送信息至工厂
 				distributionAsyncService.sendFactory(collect.get(0), distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName());
+				//收集包件
+				orderpackages.add(collect.get(0).getOrderPackageCode());
 			} else {
 				//一个客户下出现重复包条码
 				log.error("############出现重复包条码：{}", collect);
 				throw new RuntimeException("包件数据异常，请联系管理员!!!");
 			}
 		}
-		String str = checkSignNum(distrilbutionloadingscanDTO);
 		//维护客户
 		distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId());
 		//维护配送任务
 		distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
-		return Resp.scanSuccess("签收成功", str);
+		return R.data(orderpackages,"签收成功");
 	}
 
 	private boolean judgmentClient(DistributionReservationEntity distributionReservationEntity, Long stockArticleId) {