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-23 18:06:56 +08:00
parent 38e9ed6d93 4edad1ba33
commit e728f1d2af
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,9 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
public Page<BomNewMbomMiddleVO> workListPage(BomNewMbomParentQuery query) { public Page<BomNewMbomMiddleVO> workListPage(BomNewMbomParentQuery query) {
query.setStatus(MBomConstantEnum.MBomStatusEnum.UNPUB_SAP.getValue()); query.setStatus(MBomConstantEnum.MBomStatusEnum.UNPUB_SAP.getValue());
query.setFacCode(SpringUtil.getBean(UserRoleService.class).getUserFactory()); List<String> facCode= SpringUtil.getBean(UserRoleService.class).getUserOfFactory();
String code= StrUtil.join(",",facCode);
query.setFacCode(code);
return listPage(query); return listPage(query);
} }
@ -92,7 +94,9 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
public Page<BomNewMbomMiddleVO> formalListPage(BomNewMbomParentQuery query) { public Page<BomNewMbomMiddleVO> formalListPage(BomNewMbomParentQuery query) {
query.setStatus(MBomConstantEnum.MBomStatusEnum.PUB_SAP.getValue()); query.setStatus(MBomConstantEnum.MBomStatusEnum.PUB_SAP.getValue());
query.setFacCode(SpringUtil.getBean(UserRoleService.class).getUserFactory()); List<String> facCode= SpringUtil.getBean(UserRoleService.class).getUserOfFactory();
String code= StrUtil.join(",",facCode);
query.setFacCode(code);
return listPage(query); return listPage(query);
} }

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

@ -60,7 +60,7 @@
and material_no=#{query.materialNo} and material_no=#{query.materialNo}
</if> </if>
<if test="query.facCode!=null and query.facCode!=''"> <if test="query.facCode!=null and query.facCode!=''">
and fac_code=#{query.facCode} and fac_code in (${query.facCode})
</if> </if>
@ -146,7 +146,7 @@
and t2.status=#{query.status} and t2.status=#{query.status}
</if> </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 in (${query.facCode})
</if> </if>
<if test="query.drawingNo!=null and query.drawingNo!=''"> <if test="query.drawingNo!=null and query.drawingNo!=''">
and t1.drawing_no like concat ('',#{query.drawingNo},'%') and t1.drawing_no like concat ('',#{query.drawingNo},'%')