From 77838e01b0c6bebcc1cf5b220bec74d147c1081c Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 18 Oct 2024 21:53:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=AD=BE=E6=94=B6=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E7=BB=B4=E6=8A=A4=E7=AD=BE=E6=94=B6=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?ID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 27458a544..77e08cdfb 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -1038,7 +1038,7 @@
         ldbls.scan_user AS driverName,
         ldbl.pick_up_plate AS carNumber,
         ldbl.update_time AS deliveryTime,
-        ldbl.update_time AS signTime,
+        ldbls.create_time AS signTime,
         ldbls.scan_user AS loadingUser,
         ldbls.scan_user AS signUser,
         ldbl.pickup_batch AS signOrderCode
@@ -1061,7 +1061,7 @@
         ldbls.scan_user AS driverName,
         ldbl.pick_up_plate AS carNumber,
         ldbl.update_time AS deliveryTime,
-        ldbl.update_time AS signTime,
+        ldbls.create_time AS signTime,
         ldbls.scan_user AS loadingUser,
         ldbls.scan_user AS signUser,
         ldbl.pickup_batch AS signOrderCode
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 8dfa28cf6..efdf78b00 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
@@ -4662,6 +4662,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					billLadingScan.setBillLadingId(billLadingAppDTO.getBillLadingId());
 					billLadingScan.setMaterialType("3");
 					billLadingScan.setQuantity(i.getQuantity());
+					billLadingScan.setWarehouseId(myCurrentWarehouse.getId());
 					billLadingScanList.add(billLadingScan);
 					//维护零担品类的出库数量