From a4c34130e4f4b7b3ff56ba58b3c0d1bdbc1a867e Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 6 Jan 2024 16:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=A4=87=E8=B4=A7=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E6=8F=90=E4=BA=A4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionDeliveryListMapper.xml    |  2 +-
 .../impl/DistributionReservationServiceImpl.java | 16 +++++++++++++++-
 .../impl/DistributionSignforServiceImpl.java     |  3 +--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index 926562970..cf46a25ab 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -774,7 +774,7 @@
             </if>
 
         </where>
-        /*ORDER BY lddl.create_time DESC*/
+        ORDER BY lddl.create_time DESC
     </select>
     <select id="getDeliveryStockArticleInfo" resultType="com.logpm.distribution.vo.DistributionStockArticleVO">
         SELECT
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 7d1a8e171..889912069 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
@@ -980,9 +980,23 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			return R.fail("请先选择作业仓库!!!");
 		}
 		boolean result = false;
+		if (Func.isEmpty(stockUpInfo.get("ids"))) {
+			log.error("参数异常:+{" + stockUpInfo.get("ids") + "}");
+			return R.fail("服务器正忙!!!");
+		}
+		String ids = (String) stockUpInfo.get("ids");
+		List<Long> list = Func.toLongList(",", ids);
+		List<DistributionReservationEntity> distributionReservationEntities = this.listByIds(list);
+		if (Func.isNotEmpty(distributionReservationEntities)){
+			//查询此次进行提交的预约是否已经进行备货任务的提交
+			List<DistributionReservationEntity> yijingbeihuo = distributionReservationEntities.stream().filter(p -> p.getStockupStatus().equals(ReservationStockupStatusConstant.daibeihuo.getValue())).collect(Collectors.toList());
+			if (Func.isNotEmpty(yijingbeihuo) && yijingbeihuo.size() >=1){
+				String errorReservationCode = yijingbeihuo.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","));
+				return R.fail("预约单号:"+errorReservationCode+"已经提交过备货任务!!!");
+			}
+		}
 		try {
 			//获取前端携带批量转备货的id
-			String ids = (String) stockUpInfo.get("ids");
 			//完成对备货表数据的保存
 			String stockUpDate = (String) stockUpInfo.get("stockupDate");
 			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
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 0b7eabcb8..8327985d6 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
@@ -632,7 +632,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}else {
 				signforEntity.setIsHaveAbnormalPackage(2);
 			}
-
 		}
 		this.updateById(signforEntity);
 	}
@@ -1584,7 +1583,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			//查询这个包件是否满足该客户的要求
 			DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distrilbutionloadingscanDTO.getReservationId());
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-			DistributionSignforEntity signforEntity = distributionSignforMapper.getByReservationId(reservationEntity.getId());
 
 			DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
 			DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfEntity();
@@ -1769,6 +1767,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionLoadscanAbnormalService.save(distributionLoadscanAbnormalEntity);
 			}
 			//修改对应的签收为可审核
+			DistributionSignforEntity signforEntity = distributionSignforMapper.getByReservationId(reservationEntity.getId());
 			signforEntity.setIsHaveAbnormalPackage(2);
 			this.updateById(signforEntity);
 			//修改包件的签收数量