rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DM/nflg-新需求' into test

This commit is contained in:
luolm 2024-09-23 21:49:00 +08:00
parent 96d9492e6a 79504b297d
commit 5e589ec30d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
View File

@ -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