From 3d7128d95ca99378af999f9dcd11a1fbc3c88f7c Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Mon, 23 Sep 2024 21:46:55 +0800
Subject: [PATCH] =?UTF-8?q?pbom-=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 2607d23cb86a136c0e25ccebf350bec907be77cd)
---
 .../main/resources/mapper/master/BomNewPbomParentMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
index 79214306..a66348a4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
@@ -105,16 +105,16 @@
     <select id="releaseListByPage" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
         select * , row_id as bomRowId
         from t_bom_new_pbom_parent a join
-         (select material_no, max(current_version) current_version from t_bom_new_pbom_parent where status  &gt;= 4
+         (select material_no,fac_code, max(current_version) current_version from t_bom_new_pbom_parent where status  &gt;= 4
           <if test="query.materialNo!= null and query.materialNo!=''">
             and material_no = #{query.materialNo}
           </if>
           <if test="query.drawingNo!= null and query.drawingNo!=''">
             and drawing_no = #{query.drawingNo}
           </if>
-          group by material_no
+          group by material_no ,fac_code
           ) b
-        on a.material_no=b.material_no and a.current_version=b.current_version
+        on a.material_no=b.material_no and a.current_version=b.current_version and a.fac_code=b.fac_code
         where  status  &gt;= 4
         <if test=" (query.materialNo== null || query.materialNo=='' ) and (query.drawingNo== null || query.drawingNo=='')">
             and root_is=1