From 089ecf3049cf224a2ecb9d09cd7088146e067fec Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 6 Jan 2024 17:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=A2=9E=E5=8A=A0=E6=89=AB=E6=8F=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 15e24605e..0fb91a453 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
@@ -1529,6 +1529,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public R signforack(DistributionSignforDTO distributionSignfor) {
+		DistributionSignforEntity signforEntity = distributionSignforMapper.getByReservationId(distributionSignfor.getReservationId());
+		if (Func.isEmpty(signforEntity)){
+			log.error("预约查询签收信息错误");
+			return R.fail("请联系管理员!!!");
+		}
+		if (signforEntity.getReceivedQuantity() <= 0){
+			log.error("signforack############未进行签收上传图片");
+			return Resp.scanFail("请先进行签收扫描后上传图片","请先进行签收扫描后上传图片");
+		}
+
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 		log.info("=============签收图片数据为：{}", distributionSignfor.getMap());
 		if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {
@@ -3481,6 +3491,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public Boolean updatePicture(DistributionSignforDTO distributionSignfor) {
+
 		if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {
 			List<DistributionSignPrintEntity> distributionSignPrintList = new ArrayList<>();
 			distributionSignfor.getMap().forEach((k, v) -> {