From 666c42a128d4abf633940b9c005b72a4f3457245 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 26 Aug 2025 16:42:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(query):=20=E4=BF=AE=E5=A4=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=E6=9C=AA=E8=80=83=E8=99=91=20del=5Fflag=20?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=BF=94=E5=9B=9E=E5=B7=B2=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个 Mapper 文件中，为 LEFT JOIN 的条件添加 del_flag = 0 判断 - 确保查询结果中不包含已删除的数据 --- .../src/main/resources/mapper/klp/WmsExpressMapper.xml | 4 ++-- .../resources/mapper/klp/WmsExpressQuestionMapper.xml | 2 +- .../resources/mapper/klp/WmsFinancialDocumentMapper.xml | 2 +- .../main/resources/mapper/klp/WmsOrderDetailMapper.xml | 2 +- klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml | 2 +- .../src/main/resources/mapper/klp/WmsPayableMapper.xml | 2 +- .../src/main/resources/mapper/klp/WmsProductBomMapper.xml | 6 +++--- .../main/resources/mapper/klp/WmsProductionTaskMapper.xml | 4 ++-- .../resources/mapper/klp/WmsPurchasePlanDetailMapper.xml | 6 +++--- .../src/main/resources/mapper/klp/WmsReceivableMapper.xml | 2 +- .../main/resources/mapper/klp/WmsReportDetailMapper.xml | 2 +- .../resources/mapper/klp/WmsSchedulePlanDetailMapper.xml | 8 ++++---- .../main/resources/mapper/klp/WmsStockIoDetailMapper.xml | 8 ++++---- .../src/main/resources/mapper/klp/WmsStockLogMapper.xml | 2 +- klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml | 6 +++--- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/klp-wms/src/main/resources/mapper/klp/WmsExpressMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsExpressMapper.xml index 0fb773ba..45c517de 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsExpressMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsExpressMapper.xml @@ -43,7 +43,7 @@ oe.remark, su.nick_name as ownerName from wms_express oe - left join sys_user su on su.user_id = oe.owner_id + left join sys_user su on su.user_id = oe.owner_id and su.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsExpressQuestionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsExpressQuestionMapper.xml index e80ca3a7..27a9fe1e 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsExpressQuestionMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsExpressQuestionMapper.xml @@ -33,7 +33,7 @@ oeq.remark, oe.express_code from wms_express_question oeq - left join wms_express oe on oe.express_id = oeq.express_id + left join wms_express oe on oe.express_id = oeq.express_id and oe.del_flag = 0 ${ew.getCustomSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml index d812d476..912d66f3 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml @@ -68,7 +68,7 @@ wje.status as je_status, wje.remark as je_remark FROM wms_financial_document wfd - LEFT JOIN wms_journal_entry wje ON wfd.document_id = wje.document_id + LEFT JOIN wms_journal_entry wje ON wfd.document_id = wje.document_id AND wje.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml index a63a1617..3e3f722d 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.product_name AS productName, p.product_code AS productCode FROM wms_order_detail d - LEFT JOIN wms_product p ON d.product_id = p.product_id + LEFT JOIN wms_product p ON d.product_id = p.product_id AND p.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml index 4f9793e2..86a94e8d 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml @@ -37,7 +37,7 @@ o.no_tax_amount, c.name as customerName from wms_order o - left join wms_customer c on o.customer_id = c.customer_id + left join wms_customer c on o.customer_id = c.customer_id and c.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsPayableMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsPayableMapper.xml index 346e276c..d50691bc 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsPayableMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsPayableMapper.xml @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.update_time, p.update_by from wms_payable p - left join wms_supplier s on p.supplier_id = s.supplier_id + left join wms_supplier s on p.supplier_id = s.supplier_id and s.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml index a78c64a2..f7271456 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml @@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductionTaskMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductionTaskMapper.xml index 3f8352af..969915d8 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsProductionTaskMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsProductionTaskMapper.xml @@ -100,8 +100,8 @@ psg.remark as psg_remark from wms_production_task t - left join wms_order o on t.order_id = o.order_id - left join wms_order_detail od on t.order_item_id = od.detail_id + left join wms_order o on t.order_id = o.order_id and o.del_flag = 0 + left join wms_order_detail od on t.order_item_id = od.detail_id and od.del_flag = 0 left join wms_manufacturing_spec ms on t.manufacturing_spec_id = ms.spec_id and ms.del_flag = 0 left join wms_product_spec_group psg on t.product_spec_group_id = psg.group_id and psg.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml index f117e1c8..6549c175 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml @@ -33,9 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" wc.contract_no AS contractNo FROM wms_purchase_plan_detail wpd - LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.raw_material_id - left join wms_supplier ws on wpd.supplier_id = ws.supplier_id - left join wms_contract wc on wpd.contract_id = wc.contract_id + LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.raw_material_id and wm.del_flag = 0 + left join wms_supplier ws on wpd.supplier_id = ws.supplier_id and ws.del_flag = 0 + left join wms_contract wc on wpd.contract_id = wc.contract_id and wc.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml index 148a18bc..2cc426b4 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" r.update_by, c.name as customerName from wms_receivable r - left join wms_customer c on r.customer_id = c.customer_id + left join wms_customer c on r.customer_id = c.customer_id and c.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsReportDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsReportDetailMapper.xml index f3084bdd..ff11ee46 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsReportDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsReportDetailMapper.xml @@ -59,7 +59,7 @@ ord.del_flag, ord.remark from wms_report_detail ord - left join wms_report_summary ors on ors.summary_id = ord.summary_id + left join wms_report_summary ors on ors.summary_id = ord.summary_id and ors.del_flag = 0 where project_id = #{projectId} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml index c008c135..42f2d53a 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml @@ -42,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" wpt.plan_name AS planName, wpt.plan_code AS planCode FROM wms_schedule_plan_detail wspd - left join wms_production_line wpl on wspd.line_id = wpl.line_id - left join wms_production_task wpt on wspd.task_id = wpt.task_id + left join wms_production_line wpl on wspd.line_id = wpl.line_id and wpl.del_flag = 0 + left join wms_production_task wpt on wspd.task_id = wpt.task_id and wpt.del_flag = 0 ${ew.customSqlSegment} @@ -53,8 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" wpt.plan_name AS planName, wpt.plan_code AS planCode FROM wms_schedule_plan_detail wspd - left join wms_production_line wpl on wspd.line_id = wpl.line_id - left join wms_production_task wpt on wspd.task_id = wpt.task_id + left join wms_production_line wpl on wspd.line_id = wpl.line_id and wpl.del_flag = 0 + left join wms_production_task wpt on wspd.task_id = wpt.task_id and wpt.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockIoDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockIoDetailMapper.xml index dd18c983..48491ce4 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsStockIoDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsStockIoDetailMapper.xml @@ -45,8 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w1.warehouse_name AS warehouseName, w2.warehouse_name AS fromWarehouseName FROM wms_stock_io_detail d - LEFT JOIN wms_warehouse w1 ON d.warehouse_id = w1.warehouse_id - LEFT JOIN wms_warehouse w2 ON d.from_warehouse_id = w2.warehouse_id + LEFT JOIN wms_warehouse w1 ON d.warehouse_id = w1.warehouse_id and w1.del_flag = 0 + LEFT JOIN wms_warehouse w2 ON d.from_warehouse_id = w2.warehouse_id and w2.del_flag = 0 d.stock_io_id = #{stockIoId} @@ -75,8 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w1.warehouse_name AS warehouseName, w2.warehouse_name AS fromWarehouseName FROM wms_stock_io_detail d - LEFT JOIN wms_warehouse w1 ON d.warehouse_id = w1.warehouse_id - LEFT JOIN wms_warehouse w2 ON d.from_warehouse_id = w2.warehouse_id + LEFT JOIN wms_warehouse w1 ON d.warehouse_id = w1.warehouse_id and w1.del_flag = 0 + LEFT JOIN wms_warehouse w2 ON d.from_warehouse_id = w2.warehouse_id and w2.del_flag = 0 ${ew.customSqlSegment} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml index bbc40cc1..8c9e55ae 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml index 18065e71..4c2312e1 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml @@ -41,9 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ELSE NULL END AS itemCode FROM wms_stock s - LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id - LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id - left join wms_warehouse w on s.warehouse_id = w.warehouse_id + LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id and p.del_flag = 0 + LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id and r.del_flag = 0 + left join wms_warehouse w on s.warehouse_id = w.warehouse_id and w.del_flag = 0 ${ew.customSqlSegment}