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

Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom

This commit is contained in:
大米 2024-01-08 18:43:19 +08:00
parent b158c48de9 76028e0c64
commit 55da2e01c0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomBackMaterialMapper.xml
View File

@ -50,7 +50,7 @@
on t1.detail_row_id=t2.row_id on t1.detail_row_id=t2.row_id
left join t_bom_new_mbom_parent t3 left join t_bom_new_mbom_parent t3
on t1.bom_row_id=t3.row_id on t1.bom_row_id=t3.row_id
order by t1.back_status asc,t1.created_time desc
<where> <where>
<if test="query.drawingNo!=null and query.drawingNo!=''"> <if test="query.drawingNo!=null and query.drawingNo!=''">
@ -66,6 +66,7 @@
<![CDATA[ and t1.created_time >= #{query.startDate} and t1.created_time <=#{query.endDate}]]> <![CDATA[ and t1.created_time >= #{query.startDate} and t1.created_time <=#{query.endDate}]]>
</if> </if>
</where> </where>
order by t1.back_status asc,t1.created_time desc
</select> </select>