From 0960318ddab4bddc6726609e404a62594578c6af Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 27 Sep 2024 16:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=A3=85=E8=BD=A6=E5=92=8C=E7=AD=BE=E6=94=B6=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 e1c729a1b..3b9d51a6c 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
@@ -3636,7 +3636,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (Func.isNotEmpty(loadscanEntity)) {
 							distributionLoadscanEntity = loadscanEntity;
 						}
-
 						if (StringUtils.isNotBlank(deliverySelfEntity.getDriverPhone())) {
 							distributionLoadscanEntity.setDriverPhone(deliverySelfEntity.getDriverPhone());
 						}
@@ -3681,6 +3680,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setIsAbnormalLoading(2);
 						distributionLoadscanEntity.setIsAbnormalSigning(2);
 						distributionLoadscanEntity.setAbnormalNote("异常签收");
+						distributionLoadscanEntity.setIsZero(0);
 						loadscanEntity = distributionLoadscanEntity;
 						log.info("异常签收>>>>>>>>>>>>>>>reservationId:{},deliveryId:{},orderPackageCode:{}", distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getOrderPackageCode());
 						//进行签收数量的修改
@@ -3785,14 +3785,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							loadingId = distributionLoadscanEntity.getId();
 							distributionLoadscanService.save(distributionLoadscanEntity);
 							pushList.add(distributionLoadscanEntity);
+							Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						} else {
 							loadingId = distributionLoadscanEntity.getId();
 							content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "扫描异常签收,装车方式:扫描装车,配送车次号:" + distributionDeliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
 							distributionLoadscanService.updateById(distributionLoadscanEntity);
+							distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						}
-						Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
-						//进行签收数量的修改
-						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 						//修改包件装车、签收状态
 						packageLockIds.add(distributionLoadscanEntity.getPackageId());
 						JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());