Commit feca9768 authored by wux's avatar wux

bug186:应收款查询屏蔽管理订单不存在的数据

parent 8d268d68
...@@ -110,7 +110,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> { ...@@ -110,7 +110,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
"left join ecw_warehouse_line de on o.line_id = de.id ", "left join ecw_warehouse_line de on o.line_id = de.id ",
"left join ecw_order_consignor nor on nor.order_id = o.order_id ", "left join ecw_order_consignor nor on nor.order_id = o.order_id ",
"left join ecw_order_consignee nee on nee.order_id = o.order_id ", "left join ecw_order_consignee nee on nee.order_id = o.order_id ",
"where r.deleted = 0 and r.receipt_id is null ", "where r.deleted = 0 and r.receipt_id is null and o.order_id is not null",
"<when test = 'query.status != null'>", "<when test = 'query.status != null'>",
"AND o.`status` = #{query.status}", "AND o.`status` = #{query.status}",
"</when>", "</when>",
...@@ -428,4 +428,4 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> { ...@@ -428,4 +428,4 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
IPage<BatchGenReceiptReceivablePageVO> batchGenReceiptReceivablePage(IPage<BatchGenReceiptReceivablePageVO> mpPage, @Param("query") BatchGenReceiptReceivablePageQueryVO query); IPage<BatchGenReceiptReceivablePageVO> batchGenReceiptReceivablePage(IPage<BatchGenReceiptReceivablePageVO> mpPage, @Param("query") BatchGenReceiptReceivablePageQueryVO query);
List<CurrencyAmount> batchGenReceiptReceivablAmount(@Param("query") BatchGenReceiptReceivablePageQueryVO query); List<CurrencyAmount> batchGenReceiptReceivablAmount(@Param("query") BatchGenReceiptReceivablePageQueryVO query);
} }
\ No newline at end of file
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<if test="query.consigneeNameOrPhone != null and query.consigneeNameOrPhone != '' "> <if test="query.consigneeNameOrPhone != null and query.consigneeNameOrPhone != '' ">
LEFT JOIN ecw_order_consignee nee ON nee.order_id = r.order_id LEFT JOIN ecw_order_consignee nee ON nee.order_id = r.order_id
</if> </if>
WHERE r.deleted = 0 AND r.receipt_id IS NULL WHERE r.deleted = 0 AND r.receipt_id IS NULL and o.order_id is not null
<if test="query.status != null"> <if test="query.status != null">
AND o.`status` = #{query.status} AND o.`status` = #{query.status}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment