From 4fd2ca20c657f446bd664d399a5feed97276806c Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 14 Aug 2024 11:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=88=A4=E5=AE=9A=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AE=A1=E6=A0=B8BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistrilbutionBillLadingServiceImpl.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index c857f9b62..435724849 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -109,6 +109,7 @@ import com.logpm.oldproject.dto.SignPushDataUnitDTO;
 import com.logpm.oldproject.feign.IOldSignPushClient;
 import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.extern.log4j.Log4j2;
 import org.apache.logging.log4j.util.Strings;
 import org.jetbrains.annotations.NotNull;
@@ -1266,8 +1267,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			// 转换仓库ID
 //			modifyWarehouseId(delivery);
 
-			Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
-			return b;
+			Map<String,Object> map = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
+			Boolean flag = (Boolean) map.get("result");
+			return flag;
 		} catch (Exception e) {
 			log.error(">>>>> 推送老系统自提签收信息报错", e);
 			return false;
@@ -3595,7 +3597,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 
 				if (Func.isNotEmpty(ladingScanEntities)) {
-					int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
+					int sum = ladingScanEntities.stream().filter(f->f.getMaterialType().equals("2")).mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
 //					if (sum == 0){
 //						//未进行任何签收扫描的操作这里需要进行拦截
 //						throw new ServiceException("无签收数据");