From 084ddae5d69e938a3fe89fb794048c0c79cadf26 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 10 Apr 2025 09:15:37 +0800 Subject: [PATCH] =?UTF-8?q?2025-04-10=20BOM=20Routing=20=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=B7=B2=E8=BD=AC=E6=AD=A3=E7=9A=84=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/part/BomManagementMapper.xml | 1 + src/main/resources/mapper/part/BomSearch3Mapper.xml | 1 + src/main/resources/mapper/part/RecipeManagementMapper.xml | 1 + src/main/resources/mapper/part/RoutingManagementMapper.xml | 4 +++- src/main/resources/mapper/part/WorkGuidelinesMapper.xml | 2 ++ 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml index abd38e38..0faa0fa6 100644 --- a/src/main/resources/mapper/part/BomManagementMapper.xml +++ b/src/main/resources/mapper/part/BomManagementMapper.xml @@ -28,6 +28,7 @@ left join part as b on a.site = b.site and a.part_no = b.part_no a.site = #{query.site} + AND NOT (b.status = 'Y' AND (b.plm_part_no IS NULL OR b.plm_part_no = '')) AND a.part_no like #{query.partNo} diff --git a/src/main/resources/mapper/part/BomSearch3Mapper.xml b/src/main/resources/mapper/part/BomSearch3Mapper.xml index 4aed6e6f..3848798a 100644 --- a/src/main/resources/mapper/part/BomSearch3Mapper.xml +++ b/src/main/resources/mapper/part/BomSearch3Mapper.xml @@ -26,6 +26,7 @@ left join part as b on a.site = b.site and a.part_no = b.part_no a.site = #{query.site} + AND NOT (b.status = 'Y' AND (b.plm_part_no IS NULL OR b.plm_part_no = '')) AND a.part_no like #{query.partNo} diff --git a/src/main/resources/mapper/part/RecipeManagementMapper.xml b/src/main/resources/mapper/part/RecipeManagementMapper.xml index 22386371..f50873c8 100644 --- a/src/main/resources/mapper/part/RecipeManagementMapper.xml +++ b/src/main/resources/mapper/part/RecipeManagementMapper.xml @@ -28,6 +28,7 @@ left join part as b on a.site = b.site and a.part_no = b.part_no a.site = #{query.site} + AND NOT (b.status = 'Y' AND (b.plm_part_no IS NULL OR b.plm_part_no = '')) AND a.part_no like #{query.partNo} diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml index 7ab0cd64..b1a946fc 100644 --- a/src/main/resources/mapper/part/RoutingManagementMapper.xml +++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml @@ -24,6 +24,7 @@ left join part as b on a.site = b.site and a.part_no = b.part_no a.site = #{query.site} + AND NOT (b.status = 'Y' AND (b.plm_part_no IS NULL OR b.plm_part_no = '')) AND a.part_no like #{query.partNo} @@ -658,7 +659,7 @@ d.tool_qty, d.remark from plm_routing_header a - LEFT JOIN part e on a.site = e.site AND a.part_no =e.part_no + LEFT JOIN part e on a.site = e.site AND a.part_no = e.part_no LEFT JOIN plm_routing_detail b on a.site = b.site AND a.part_no =b.part_no AND a.routing_revision = b.routing_revision and a.routing_type = b.routing_type LEFT JOIN plm_routing_component c on a.site = c.site AND a.part_no =c.part_no AND a.routing_revision = c.routing_revision and a.routing_type = c.routing_type and b.alternative_no = c.alternative_no LEFT JOIN routing_tool d on a.site = d.site AND a.part_no =d.part_no AND a.routing_revision = d.routing_revision and a.routing_type = d.routing_type and c.alternative_no = d.alternative_no and c.operation_id = d.operation_id @@ -667,6 +668,7 @@ LEFT JOIN labor_class j on a.site = j.site AND c.setup_labor_class_no = j.level_id a.site = #{query.site} + AND NOT (e.status = 'Y' AND (e.plm_part_no IS NULL OR e.plm_part_no = '')) AND a.part_no like #{query.partNo} diff --git a/src/main/resources/mapper/part/WorkGuidelinesMapper.xml b/src/main/resources/mapper/part/WorkGuidelinesMapper.xml index 923cc58c..20c89445 100644 --- a/src/main/resources/mapper/part/WorkGuidelinesMapper.xml +++ b/src/main/resources/mapper/part/WorkGuidelinesMapper.xml @@ -166,8 +166,10 @@ a.ifs_row_version FROM plm_routing_work_guide as a LEFT JOIN plm_routing_component as b on a.site = b.site and a.part_no = b.part_no and a.routing_revision = b.routing_revision and a.routing_type = b.routing_type and a.alternative_no = b.alternative_no and a.operation_id = b.operation_id + left join part as p on a.site = p.site and a.part_no = p.part_no a.site = #{query.site} + AND NOT (p.status = 'Y' AND (p.plm_part_no IS NULL OR p.plm_part_no = '')) AND a.part_no like #{query.partNo}