From eb541f850c38eb34a1adca6134be06df3b1b91de Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 11:28:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(delivery):=20=E4=BF=AE=E5=A4=8D=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 delFlag 字段的映射配置
- 在 CRM 订单关联查询中添加了删除标记过滤条件
- 确保只查询未删除的订单数据
- 修复了可能因已删除订单导致的数据不一致问题
---
 .../resources/mapper/klp/WmsDeliveryWaybillMapper.xml    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
index 6147a756..3acfc4c8 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
@@ -45,7 +45,6 @@
         <result property="principalPhone" column="principal_phone"/>
         <result property="status" column="status"/>
         <result property="remark" column="remark"/>
-        <result property="delFlag" column="del_flag"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
@@ -53,7 +52,7 @@
     </resultMap>
 
     <select id="selectVoPagePlus" resultMap="WmsDeliveryWaybillVoResult">
-        SELECT 
+        SELECT
             wd.waybill_id AS waybill_id,
             wd.waybill_no AS waybill_no,
             wd.waybill_name AS waybill_name,
@@ -77,12 +76,12 @@
             wd.update_time AS update_time,
             wd.update_by AS update_by
         FROM wms_delivery_waybill wd
-        LEFT JOIN crm_order co ON wd.order_id = co.order_id
+        LEFT JOIN crm_order co ON wd.order_id = co.order_id and co.del_flag = 0
         ${ew.customSqlSegment}
     </select>
 
     <select id="selectVoListPlus" resultMap="WmsDeliveryWaybillVoResult">
-        SELECT 
+        SELECT
             wd.waybill_id AS waybill_id,
             wd.waybill_no AS waybill_no,
             wd.waybill_name AS waybill_name,
@@ -106,7 +105,7 @@
             wd.update_time AS update_time,
             wd.update_by AS update_by
         FROM wms_delivery_waybill wd
-        LEFT JOIN crm_order co ON wd.order_id = co.order_id
+        LEFT JOIN crm_order co ON wd.order_id = co.order_id and co.del_flag = 0
         ${ew.customSqlSegment}
     </select>