From f5f30d1d522835afe887262a5be0e5736866f9dd Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Mar 2024 09:05:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=85=8D=E9=80=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionDeliveryListMapper.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8de57a821..382c9e887 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
@@ -2030,7 +2030,7 @@
     </select>
     <select id="selectSignforByDeliveryId"
             resultType="com.logpm.distribution.entity.DistributionSignforEntity">
-        SELECT * FROM logpm_distribution_signfor AS lds  LEFT JOIN  logpm_distribution_reservation AS ldr
+        SELECT * FROM logpm_distribution_signfor AS lds  LEFT JOIN  logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
         WHERE lds.delivery_id = #{deliveryId} AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
     </select>
 

From c85352b0c010df7f37045cc9c981ecd8ea3c2809 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Mar 2024 09:54:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87BUG=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 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 90292a90f..49f6811fa 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
@@ -763,7 +763,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("预约查询签收信息错误");
 			return R.fail("请联系管理员!!!");
 		}
-		if (signforEntity.getReceivedQuantity() <= 0) {
+		if ((signforEntity.getReceivedQuantity()+signforEntity.getReceivedinQuantity()) <= 0) {
 			log.error("signforack############未进行签收上传图片");
 			return R.fail("无签收数据");
 		}
@@ -2522,7 +2522,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("预约查询签收信息错误");
 			return R.fail("请联系管理员!!!");
 		}
-		if (signforEntity.getReceivedQuantity() <= 0) {
+		if ((signforEntity.getReceivedQuantity() + signforEntity.getReceivedinQuantity()) <= 0) {
 			log.error("signforack############未进行签收上传图片");
 			return Resp.scanFail(12000, "请先进行签收扫描后上传图片", "请先进行签收扫描后上传图片", null);
 		}

From 1df553dbb7581981e38fefe9c6cacb14aa080ed8 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Mar 2024 10:07:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E8=BD=A6=E6=AC=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A3=85=E8=BD=A6=E6=95=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionLoadscanMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3849c2555..dcf611d7d 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
@@ -257,7 +257,7 @@
 
     <select id="getLoadCountNum" resultType="int">
         SELECT
-        count( ldl.id )
+        IFNULL(sum(ldl.loaded_nub),0)
         FROM
         logpm_distribution_loadscan  ldl
         right JOIN logpm_distribution_reservation ldr on ldr.id= ldl.reservation_id and ldr.reservation_status !='40'