From a3e6362f6b5d583cfa93615752404601e80ddfe6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 16 Dec 2023 20:31:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=A3=85=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionLoadscanMapper.xml    | 2 +-
 .../service/impl/DistributionDeliveryListServiceImpl.java | 2 +-
 .../service/impl/DistributionSignforServiceImpl.java      | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
index e43d8f116..6d10ff5ac 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
@@ -233,7 +233,7 @@
                 SELECT COUNT(ldl.loaded_nub) FROM logpm_distribution_loadscan AS ldl Where ldl.delivery_id = #{deliveryListId} and ldl.is_abnormal_loading = 2
     </select>
     <select id="selectOrderLoadingNum" resultType="java.lang.Integer">
-        SELECT sum(loaded_nub) FROM logpm_distribution_loadscan WHERE order_id = #{orderId} and is_deleted = 0 and scan_status != 1
+        SELECT IF(sum( loaded_nub ) is null,0,sum( loaded_nub )) FROM logpm_distribution_loadscan WHERE order_id = #{orderId} and is_deleted = 0 and scan_status != 1
     </select>
     <select id="selectOrderSignNum" resultType="java.lang.Integer">
          SELECT SUM(received_quantity) FROM logpm_distribution_loadscan WHERE  scan_status != 1 AND signfor_state =2 And order_id =#{orderId}
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 75b196cfa..abd78265f 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
@@ -5197,7 +5197,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//扣减订单在库数量
 			distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
 			//异步维护此异常装车包件的订单状态
-			distributionAsyncService.checkOrderLoadingStatus(parcelListEntity.getId());
+			distributionAsyncService.checkOrderLoadingStatus(parcelListEntity.getStockArticleId());
 			DistributionSignforEntity signforEntity = distributionSignforService.getOne(Wrappers.<DistributionSignforEntity>query().lambda().eq(DistributionSignforEntity::getReservationId, reservationEntity.getId()).eq(DistributionSignforEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()));
 			if (Func.isNotEmpty(signforEntity)) {
 				//标识该客户存在异常装车包件，为了后续的异常装车审核
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 d144fd583..3b80566f7 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
@@ -2656,6 +2656,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionLoadscanAbnormalService.updateById(distributionLoadscanAbnormalEntity);
 				reservationEntity.setReservationNum(reservationEntity.getReservationNum() + distributionLoadscanAbnormalEntity.getLoadingQuantity());
 				distributionReservationMapper.updateById(reservationEntity);
+				DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
+					.eq(DistributionLoadscanEntity::getReservationId, distributionLoadscanAbnormalEntity.getReservationId())
+					.eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanAbnormalEntity.getDeliveryListId())
+					.eq(DistributionLoadscanEntity::getPackageId, distributionLoadscanAbnormalEntity.getPackageId())
+					.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanAbnormalEntity.getPackageCode())
+				);
+				loadscanEntity.setIsAbnormalLoading(1);
+				distributionLoadscanService.updateById(loadscanEntity);
 			}
 			//单个审核
 		} else {