From 2bf5206d7c3fabf9484e8ceeec61007777e2b688 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 27 Jun 2024 23:14:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistrilbutionBillLadingServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 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 3554425f2..6c523778e 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
@@ -2920,7 +2920,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distributionBillLadingScan.setScanUser(AuthUtil.getUser().getNickName());
 
 
-			return processScan(type, billLadingId, coding, distributionBillLadingScan, myCurrentWarehouse, billLadingEntity1.getPickupBatch());
+			return processScan(type, distributionBillLadingScan.getBillLadingId(), coding, distributionBillLadingScan, myCurrentWarehouse, billLadingEntity1.getPickupBatch());
 
 //			return Resp.scanSuccess("签收成功", "签收成功");
 		} catch (Exception e) {
@@ -2950,7 +2950,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return !list3.isEmpty();
 	}
 
-	private Resp processScan(String type, Object billLadingId, String coding, DistributionBillLadingScanEntity distributionBillLadingScan, BasicdataWarehouseEntity warehouse, String pickupBatch) {
+	private Resp processScan(String type, Long billLadingId, String coding, DistributionBillLadingScanEntity distributionBillLadingScan, BasicdataWarehouseEntity warehouse, String pickupBatch) {
 		if ("1".equals(type)) {
 			// 处理库存品包件逻辑
 			return handleOrderProduct(type, billLadingId, coding, distributionBillLadingScan, warehouse, pickupBatch);