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

bug修改

This commit is contained in:
jing's 2024-01-07 18:13:26 +08:00
parent e62e5e4cf8
commit be4d901595
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java
View File

@ -44,7 +44,7 @@ public interface BomNewMbomParentMapper extends BaseMapper<BomNewMbomParentEntit
* @param rowId * @param rowId
* @return * @return
*/ */
List<BomNewMbomMiddleVO> getParentChild(@Param("rowId") Long rowId ); List<BomNewMbomMiddleVO> getParentChild(@Param("rowId") Long rowId ,@Param("bomRowId") Long bomRowId);
BomNewMbomMiddleVO getParentById(@Param("rowId") Long rowId ); BomNewMbomMiddleVO getParentById(@Param("rowId") Long rowId );

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
View File

@ -106,7 +106,7 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
if (Objects.equals(dto.getRowId(), dto.getBomRowId())) { if (Objects.equals(dto.getRowId(), dto.getBomRowId())) {
_rowId = 0l; _rowId = 0l;
} }
List<BomNewMbomMiddleVO> listChild = this.getBaseMapper().getParentChild(_rowId); List<BomNewMbomMiddleVO> listChild = this.getBaseMapper().getParentChild(_rowId,dto.getBomRowId());
if (CollectionUtil.isNotEmpty(listChild)) { if (CollectionUtil.isNotEmpty(listChild)) {
listChild.forEach(child -> { listChild.forEach(child -> {
IndexListTree.sysnParentParam(parent, child); IndexListTree.sysnParentParam(parent, child);

8
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
View File

@ -62,6 +62,7 @@
<if test="query.facCode!=null and query.facCode!=''"> <if test="query.facCode!=null and query.facCode!=''">
and fac_code=#{query.facCode} and fac_code=#{query.facCode}
</if> </if>
<if test="query.status!=null and query.status==1"> <if test="query.status!=null and query.status==1">
<if test="query.startDate!=null and query.startDate!='' and query.endDate!=null and query.endDate!=''"> <if test="query.startDate!=null and query.startDate!='' and query.endDate!=null and query.endDate!=''">
@ -112,6 +113,9 @@
left join t_bom_new_mbom_back_material as t2 left join t_bom_new_mbom_back_material as t2
on t1.row_id=t2.detail_row_id on t1.row_id=t2.detail_row_id
where t1.parent_row_id = #{rowId} where t1.parent_row_id = #{rowId}
<if test="bomRowId!=null and bomRowId!=0">
and t1.bom_row_id=#{bomRowId}
</if>
order by t1.order_number order by t1.order_number
</select> </select>
@ -138,7 +142,9 @@
on t1.bom_row_id=t2.row_id on t1.bom_row_id=t2.row_id
where t1.bom_row_id=t2.row_id and t2.last_version_is=1 where t1.bom_row_id=t2.row_id and t2.last_version_is=1
<if test="query.status!=null and query.status!=0">
and t2.status=#{query.status}
</if>
<if test="query.facCode!=null and query.facCode!=''"> <if test="query.facCode!=null and query.facCode!=''">
and t1.fac_code=#{query.facCode} and t1.fac_code=#{query.facCode}
</if> </if>