From e27f9b00f9433a2d1970f3936c2ddeaf26bb54a7 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 20 Jun 2024 16:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6PDA=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListController.java   |  4 ++--
 .../mapper/DistributionSignforMapper.xml      |  1 +
 .../IDistributionDeliveryListService.java     |  2 +-
 .../DistributionDeliveryListServiceImpl.java  | 20 ++++---------------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
index 8b848b7f0..5ff2508e2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
@@ -423,8 +423,8 @@ public class DistributionDeliveryListController extends BladeController {
 	@GetMapping("/judgmentOrderRemove")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "判断是否可以在商配计划中移除", notes = "customArgs")
-	public R<Boolean> judgmentOrderRemove(@RequestParam Long deliveryId,@RequestParam Long orderId) {
-		boolean result = distributionDeliveryListService.judgmentOrderRemove(deliveryId,orderId);
+	public R<Boolean> judgmentOrderRemove(@RequestParam Long deliveryId,@RequestParam String orderIds) {
+		boolean result = distributionDeliveryListService.judgmentOrderRemove(deliveryId,orderIds);
 		return R.data(result);
 	}
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 8eb6112b0..9084228b8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -733,6 +733,7 @@
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         WHERE lds.is_deleted = 0 AND lds.delivery_id = #{id}
+        GROUP BY lds.reservation_id
     </select>
     <select id="selectord" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
         SELECT distinct
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
index 37f34e209..82af63a91 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
@@ -401,7 +401,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param orderId
 	 * @return
 	 */
-	boolean judgmentOrderRemove(Long deliveryId, Long orderId);
+	boolean judgmentOrderRemove(Long deliveryId, String orderIds);
 
 	/**
 	 * 维护配送任务的配送数量
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index f3593b808..00898edcd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -2442,19 +2442,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				reservationStockarticleEntityList.forEach(rs -> {
 					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(rs.getStockArticleId());
 					DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(stockArticleEntity);
-//					if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) {
-////						List<DistributionReservationPackageEntity> reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda().eq(DistributionReservationPackageEntity::getReservationId, rs.getReservationId()).eq(DistributionReservationPackageEntity::getStockArticleId, stockArticleEntity.getId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue()));
-////						if (Func.isNotEmpty(reservationPackageEntityList)) {
-////							ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
-////							reservationPackageEntityList.forEach(rp -> {
-////								DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId());
-////								DistributionParcelListVO distributionParcelListVO = DistributionParcelListWrapper.build().entityVO(parcelListEntity);
-////								distributionParcelListVOS.add(distributionParcelListVO);
-////							});
-////							distributionStockArticleVO.setPackageList(distributionParcelListVOS);
-////							distributionStockArticleVO.setParcelListVOS(DistributionParcelListWrapper.build().listVO(distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, rs.getStockArticleId()))));
-////						}
-//					}
 					distributionStockArticleVO.setReservationNum(rs.getReservationNum());
 					distributionStockArticleVOS.add(distributionStockArticleVO);
 				});
@@ -7015,14 +7002,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public boolean judgmentOrderRemove(Long deliveryId, Long orderId) {
+	public boolean judgmentOrderRemove(Long deliveryId, String orderIds) {
+		List<Long> list = Func.toLongList(orderIds);
 		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 			.eq(DistributionLoadscanEntity::getDeliveryId, deliveryId)
+			.in(DistributionLoadscanEntity::getOrderId, list)
 			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 		);
 		if (Func.isNotEmpty(loadscanEntityList)) {
-			Map<Long, DistributionLoadscanEntity> loadingOrderMap = loadscanEntityList.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getOrderId, Function.identity(), (k1, k2) -> k2));
-            return !Func.isNotEmpty(loadingOrderMap.get(orderId));
+            return false;
 		}
 		return true;
 	}