From 1c633b61f61e860c501a3c4433765490e52437ae Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 6 Mar 2024 11:52:39 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E6=89=AB=E6=8F=8F=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionSignforMapper.xml | 2 +-
 .../service/impl/DistributionDeliveryListServiceImpl.java   | 6 +++---
 .../service/impl/DistributionStockListServiceImpl.java      | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

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 0b17292f2..6b0579f8e 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
@@ -1227,7 +1227,7 @@
         logpm_distribution_reservation AS ldr
         LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
-        LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND ldl.scan_status != 1
+        LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND ldl.scan_status != 1 AND ldl.reservation_id = ldr.id
         WHERE
         ldrp.packet_bar_status != 2
         AND ldr.id = #{reservationId}
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 7deefe6f5..b9b45cfdb 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
@@ -373,8 +373,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isNotEmpty(s.getStockupArea())) {
 						goodsArea.add(s.getStockupArea());
 					}
-
-
 				});
 				DistributionStockupVO distributionStockupVO = new DistributionStockupVO();
 				distributionStockupVO.setForkliftName(String.join(",", forkliftName));
@@ -383,8 +381,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //				distributionStockupVO.setOutboundDate(outboundDate);
 				distributionDeliveryListVO.setStockupInfo(distributionStockupVO);
 
-			} else {
+			} else if (distributionStockupVOList.size() == 1){
 				distributionDeliveryListVO.setStockupInfo(distributionStockupVOList.get(0));
+			}else {
+				log.info("查询无备货信息");
 			}
 		} else {
 			DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(detail.getId());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index 67925bb55..44acdcc41 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -255,6 +255,10 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			);
 
 		}
+		if (list.get(0).getCargoNumber().equals(distributionStockListDTO.getCargoNumber())){
+			log.error("库存品拆包选择目标物料一致:{}",distributionStockListDTO.getCargoNumber());
+			return false;
+		}
 		//没有新增
 		DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 		BeanUtils.copyProperties(list.get(0),distributionStockListEntity);