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

fix(ebom): 一些优化

This commit is contained in:
曹鹏飞 2024-05-17 16:14:57 +08:00
parent 61d689d7a3
commit 870d612154
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

@ -143,8 +143,6 @@ public class CheckEBomException {
vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
} else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit()) && StrUtil.isBlank(vo.getExceptionTag())) { } else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit()) && StrUtil.isBlank(vo.getExceptionTag())) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue()); 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} AND created_by = #{userCode}
</if> </if>
<if test="userJob==0"> <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>
<if test="userJob==1 and query.dataType==0"> <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>
<if test="userJob==1 and query.dataType==1"> <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>
<if test="query.deviseName!=null and query.deviseName!=''"> <if test="query.deviseName!=null and query.deviseName!=''">
AND devise_name=#{query.deviseName} AND devise_name=#{query.deviseName}