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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-05-17 16:15:15 +08:00
parent 769ccb89bf 870d612154
commit 7af8873012
2 changed files with 4 additions and 5 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/service/domain/EBom/CheckEBomException.java
View File

@ -144,8 +144,6 @@ public class CheckEBomException {
} else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit())
&& (StrUtil.isBlank(vo.getExceptionTag()) || !vo.getExceptionTag().contains("16"))) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue());
} else if (EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(vo.getProjectType()) && StrUtil.isBlank(vo.getMaterialDesc())) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue());
}
}
}

7
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
View File

@ -399,13 +399,14 @@
AND created_by = #{userCode}
</if>
<if test="userJob==0">
AND status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}
AND status IN (1,3) AND (root_is=1 OR user_root_is=1 OR root_is_for_wait_review=1) AND
created_by=#{userCode}
</if>
<if test="userJob==1 and query.dataType==0">
AND root_is=1 AND status=2
AND (root_is=1 OR user_root_is=1) AND status=2
</if>
<if test="userJob==1 and query.dataType==1">
AND root_is=1 AND status=4
AND (root_is=1 OR user_root_is=1) AND status=4
</if>
<if test="query.deviseName!=null and query.deviseName!=''">
AND devise_name=#{query.deviseName}