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

原材料规则

This commit is contained in:
luoliming 2024-02-07 15:23:33 +08:00
parent d5615be227
commit 435589379a
2 changed files with 2 additions and 2 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/OriginalBom/OriginalBomToEBomConvert.java
View File

@ -213,7 +213,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
//找到对应物料
BaseMaterialVO materialBaseInfo = getCommonMaterialByRel(childVo);
if (Objects.nonNull(materialBaseInfo) && hasParent(childVo.getMaterialNo())) {
if (Objects.nonNull(materialBaseInfo) && !hasParent(childVo.getMaterialNo())) {
List<BomNewEbomChildEntity> oldParenChild = SpringUtil.getBean(BomNewEbomChildMapper.class).getChildByMaterialNo(parentEntity.getMaterialNo());
//存在旧版本

2
nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
View File

@ -29,7 +29,7 @@ public class SessionUtil {
* @return
*/
public static String getUserCode() {
return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QMB07072700");
return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QHI17062100");
}
/**