From 2a4002654f3dbfc7526d765f440dbf8a9aa2b87e Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 18 Oct 2024 16:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index b6f547a73..6a41919c1 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -1274,7 +1274,9 @@
         AND ldpl.order_package_loading_status = 10
         AND ldpl.conditions = 1
         AND order_package_status IN (10,20)
-        and ldpl.stock_article_id = #{param.orderId} and ldpl.warehouse_id = #{warehouseId}
+        and ldpl.stock_article_id = #{param.orderId}
+        and ldpl.warehouse_id = #{warehouseId}
+        and ldpl.is_transfer = 0
         <if test="param.waybillNumber != null and param.waybillNumber != ''">
             and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
         </if>
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 6debb5690..e5dddd1fc 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
@@ -9140,10 +9140,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadscanEntity.setSigningUserId(user.getUserId());
 		distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 		distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
-		if (loadscanEntity.getLoadedNub().equals(distributionLoadscanEntity.getReceivedQuantity())) {
+		if (Objects.equals(loadscanEntity.getLoadedNub(),distributionLoadscanEntity.getReceivedQuantity())) {
 			distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 		}
-
 		return distributionLoadscanEntity;
 
 	}