fix(delivery): 修复运单查询中的数据关联问题
- 移除了 delFlag 字段的映射配置 - 在 CRM 订单关联查询中添加了删除标记过滤条件 - 确保只查询未删除的订单数据 - 修复了可能因已删除订单导致的数据不一致问题
This commit is contained in:
@@ -45,7 +45,6 @@
|
|||||||
<result property="principalPhone" column="principal_phone"/>
|
<result property="principalPhone" column="principal_phone"/>
|
||||||
<result property="status" column="status"/>
|
<result property="status" column="status"/>
|
||||||
<result property="remark" column="remark"/>
|
<result property="remark" column="remark"/>
|
||||||
<result property="delFlag" column="del_flag"/>
|
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="updateTime" column="update_time"/>
|
<result property="updateTime" column="update_time"/>
|
||||||
@@ -53,7 +52,7 @@
|
|||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<select id="selectVoPagePlus" resultMap="WmsDeliveryWaybillVoResult">
|
<select id="selectVoPagePlus" resultMap="WmsDeliveryWaybillVoResult">
|
||||||
SELECT
|
SELECT
|
||||||
wd.waybill_id AS waybill_id,
|
wd.waybill_id AS waybill_id,
|
||||||
wd.waybill_no AS waybill_no,
|
wd.waybill_no AS waybill_no,
|
||||||
wd.waybill_name AS waybill_name,
|
wd.waybill_name AS waybill_name,
|
||||||
@@ -77,12 +76,12 @@
|
|||||||
wd.update_time AS update_time,
|
wd.update_time AS update_time,
|
||||||
wd.update_by AS update_by
|
wd.update_by AS update_by
|
||||||
FROM wms_delivery_waybill wd
|
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}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectVoListPlus" resultMap="WmsDeliveryWaybillVoResult">
|
<select id="selectVoListPlus" resultMap="WmsDeliveryWaybillVoResult">
|
||||||
SELECT
|
SELECT
|
||||||
wd.waybill_id AS waybill_id,
|
wd.waybill_id AS waybill_id,
|
||||||
wd.waybill_no AS waybill_no,
|
wd.waybill_no AS waybill_no,
|
||||||
wd.waybill_name AS waybill_name,
|
wd.waybill_name AS waybill_name,
|
||||||
@@ -106,7 +105,7 @@
|
|||||||
wd.update_time AS update_time,
|
wd.update_time AS update_time,
|
||||||
wd.update_by AS update_by
|
wd.update_by AS update_by
|
||||||
FROM wms_delivery_waybill wd
|
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}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user