From 401c5bdb7103e153557bafadb7ecb1c9dafd940f Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 16 Jan 2024 12:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=8D=E6=A0=B8=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=BF=BD=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E5=95=86=E9=85=8D=E6=97=A0=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81=E6=95=B0=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionSignforMapper.java             |  8 ++++++++
 .../distribution/mapper/DistributionSignforMapper.xml |  4 ++++
 .../service/IDistributionDeliveryListService.java     |  2 +-
 .../impl/DistributionDeliveryListServiceImpl.java     | 11 +++++++++++
 .../impl/DistributionReservationServiceImpl.java      |  4 +++-
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
index 8378e7ca7..814b17f1c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
@@ -301,4 +301,12 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
 	DistributionSignforEntity getByReservationId(@Param("reservationId") Long id);
+
+	/**
+	 * 查询配送任务下任务
+	 * @param id
+	 * @param k
+	 * @return
+	 */
+    DistributionSignforEntity selectByDeliveryIdAndMallName(@Param("reservationId")Long deliveryId,@Param("mallName") String mallName);
 }
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 327555b88..5c8a7486a 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
@@ -1226,4 +1226,8 @@
     <select id="getByReservationId" resultType="com.logpm.distribution.entity.DistributionSignforEntity">
         SELECT * FROM logpm_distribution_signfor WHERE reservation_id = #{reservationId}
     </select>
+    <select id="selectByDeliveryIdAndMallName"
+            resultType="com.logpm.distribution.entity.DistributionSignforEntity">
+        SELECT * FROM  logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.delivery_id = #{deliveryId} AND ldr.mall_mame = #{mallName}
+    </select>
 </mapper>
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 bd76a2a1c..bd8587232 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
@@ -155,7 +155,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	List<DisStockListDetailVO> selectDistributionAppDeliverywrapIn( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
 
 	/**
-	 * 修改配送任务
+	 * 修改商配配送任务
 	 * @param deliveryListDTO
 	 * @return
 	 */
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 3ba29e112..02de1493c 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
@@ -2964,6 +2964,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				stockupInfoEntity.setStockUpType("1");
 				distributionStockupInfoService.save(stockupInfoEntity);
 			} else {
+				//通过配送任务查询该客户的信息是否完成审核，如果审核了则视为一个新客户
+				DistributionSignforEntity signforEntity = distributionSignforMapper.selectByDeliveryIdAndMallName(deliveryListEntity.getId(),k);
+				if (Func.isNotEmpty(signforEntity)){
+					if (Func.isNotEmpty(oldClient.get(k)) && signforEntity.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())){
+						//拦截
+						log.error("###################商配配送对完成复核进行订单追加操作失败");
+						log.error("###################配送ID:{}",deliveryListEntity.getId());
+						log.error("###################客户名称:{}",k);
+						throw new RuntimeException(k+"此客户已完成签收");
+					}
+				}
 				//根据配送计划和运单号查询出该预约
 //				DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomer(deliveryListEntityId, k);
 				DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomerUnit(deliveryListEntityId, k);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 6701cc86b..cf2682211 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -2317,7 +2317,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			reservationEntity.setReservationNum(packageTotal.get());
 			this.updateById(reservationEntity);
 			deliveryPackageTotal.getAndAdd(reservationEntity.getReservationNum());
-			inventoryNub.getAndAdd(reservationEntity.getReservationStockListNum());
+			if (Func.isNotEmpty(reservationEntity.getReservationStockListNum())){
+				inventoryNub.getAndAdd(reservationEntity.getReservationStockListNum());
+			}
 			DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
 			distributionSignforEntity.setReservationId(reservationEntity.getId());
 			distributionSignforEntity.setTrainNumber(trainNumberMa);