From 40d4adae98fb7d2f42c7ec36a15527f2875935ff Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 8 Aug 2024 10:02:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=93=81=E7=89=8C=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
index 395318cbd..4356861de 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
@@ -139,6 +139,8 @@
         FROM
         logpm_basicdata_client lbcc
         LEFT JOIN  logpm_basicdata_store_brand lbsbb ON lbcc.id = lbsbb.client_id
+        WHERE
+        lbsbb.is_deleted = 0
         GROUP BY
         lbcc.id
         ) AS t ON t.id = lbc.id

From 3531a1bdd6a4ecf3fb1dde26f1cddf29b0379f36 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 8 Aug 2024 11:06:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/oldproject/mapper/OrderDetailMapper.xml     | 2 +-
 .../logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml    | 2 +-
 .../com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml
index 9398d2fdb..b3bc5bc34 100644
--- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml
+++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml
@@ -6,7 +6,7 @@
     <select id="findRukuTime" resultType="java.util.Date">
         select create_time
         from ht_scan_log
-        where unit_no = #{unitNo} and warehouse_id = #{oldWarehouseId}
+        where unitNo = #{unitNo} and warehouse_id = #{oldWarehouseId}
         and type in (1,4)
         order by create_time desc
         limit 1
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
index 971587c7b..3b6a888b1 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
@@ -118,7 +118,7 @@
         select ltlso.id id,
         ltlso.load_id loadId,
         ltlso.warehouse_id warehouseId,
-        lww.warehouse_name warehouseName,
+        lww.name warehouseName,
         ltlso.plan_num planNum,
         ltlso.load_sign_code loadSignCode,
         ltlso.sign_num signNum,
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index b8723c62d..c6fc581b3 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -1834,6 +1834,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			updateMaterialList.add(updateMaterialEntity);
 		});
 
+		if(CollUtil.isNotEmpty(updateMaterialList)){
+			advanceDetailService.updateBatchById(updateMaterialList);
+		}
 
 		//排除importStandardOuPaiDTOS中orderPackageCode在hasOrderPackageCodeList中存在的元素
 		importStandardOuPaiDTOS = importStandardOuPaiDTOS.stream().filter(item -> !hasOrderPackageCodeList.contains(item.getOrderPackageCode())).collect(Collectors.toList());