From eadcb12351fff533504329da0ee1f0f28d2779d1 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 28 Sep 2024 16:50:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E7=AD=BE=E6=94=B6BUG?=
 =?UTF-8?q?=E3=80=81=E5=90=8E=E5=8F=B0=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=99=90=E5=88=B6=E5=90=8E=E5=8F=B0=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListController.java        |  1 -
 .../impl/DistributionSignforServiceImpl.java       | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 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 86b3f2cbf..4e1934e55 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
@@ -464,7 +464,6 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "PC签收包件")
 	public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
-
 		try{
 			R r	= distributionSignforService.signforPC(distrilbutionloadingscanDTO);
 			long time = System.currentTimeMillis();
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 69ab3817d..a74dff575 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
@@ -3175,9 +3175,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			if (!Objects.isNull(warehouseConfig.getIsStrictLoading())){
 				 isStrictLoading = warehouseConfig.getIsStrictLoading();
 			}
-			if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())){
-				return R.fail("因严格装车要求,需在PDA完成!!");
-			}
+
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distrilbutionloadingscanDTO.getReservationId());
 			if (Func.isEmpty(distributionReservationEntity)) {
 				log.error("########无效的预约单,reservationId:{}", distrilbutionloadingscanDTO.getReservationId());
@@ -3276,6 +3274,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 						aaa.add(trunklinePackageTrackLog);
 					} else {
+						if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())){
+							return R.fail("操作失败,存在未装车包件");
+						}
 						//这里装车的数据需要进行补录
 						DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfDTO();
 						if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
@@ -3379,7 +3380,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 			//添加缓存
 			if (!packageLockIds.isEmpty()) {
-				List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:");
+				List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + deliveryListEntity.getTrainNumber() + ":orderPackageCode:");
 				if (Func.isNotEmpty(a)) {
 					assert a != null;
 					boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
@@ -3388,10 +3389,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						throw new CustomerException("该包件正在被操作,请稍后再试!!!");
 					} else {
 						packageLockIds.addAll(a);
-						bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L);
+						bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + deliveryListEntity.getTrainNumber() + ":orderPackageCode:", packageLockIds, 60L);
 					}
 				} else {
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + deliveryListEntity.getTrainNumber() + ":orderPackageCode:", packageLockIds, 60L);
 				}
 			}
 			//维护客户
@@ -7753,7 +7754,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading) {
 							//校验司机是否一致
 							if (!loadscanEntity.getDriverName().equals(distributionDeliverySelfEntity.getDriverName()) ||
-								!loadscanEntity.getDriverId().equals(distributionDeliverySelfEntity.getDriverId()) ||
 								!loadscanEntity.getVehicleName().equals(distributionDeliverySelfEntity.getVehicleNub())
 							) {
 								return Resp.scanFail("当前操作人无此包件签收权限!!!", "当前操作人无此包件签收权限");