From 84c38a980b3e9b11483a07b8384c8b4540931179 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 20 Mar 2024 16:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=AD=BE=E6=94=B6=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionDeliveryInfoMapper.xml    | 4 ++--
 .../service/impl/DistributionDeliveryListServiceImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 2ba651f41..2b5c82d2e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -90,7 +90,7 @@
         lds.loaded_number loadedNub,
         lds.loadedin_number inventoryNub,
         lds.reservation_id reservationId,
-        lds.received_quantity receivedQuantity,
+        (lds.received_quantity + lds.receivedin_quantity) receivedQuantity,
         lds.is_have_abnormal_package isHaveAbnormalPackage,
         lds.signee_name signeeName,
         CASE
@@ -652,7 +652,7 @@ FROM
         lds.loaded_number loadedNub,
         lds.loadedin_number inventoryNub,
         lds.reservation_id reservationId,
-        lds.received_quantity receivedQuantity,
+        (lds.received_quantity + lds.receivedin_quantity) receivedQuantity,
         lds.is_have_abnormal_package isHaveAbnormalPackage,
         lds.signee_name signeeName,
         (SELECT
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 96ddc6826..6e8f6b11f 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
@@ -5352,7 +5352,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
 		if (Func.isEmpty(distributionDeliveryListEntity)) {
 			log.error("############################# 配送任务查询为空,deliveryId为:{}", distributionDeliveryListEntity);
-			return Resp.scanFail("你在干嘛?", "会不会传参数!!!");
+			return Resp.scanFail("参数错误", "参数错误!!!");
 		}
 		//零担订单进行装车
 		//这里需要进行判定是进行编辑还是进行的装车