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

BUG修复

This commit is contained in:
大米 2024-02-18 15:24:37 +08:00
parent 4dad05c287
commit e3632534b5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
View File

@ -84,10 +84,16 @@ public class EBomToPBom {
//bom 提层 //bom 提层
liftingLayer(); liftingLayer();
List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()); List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList());
List<String> hasConvert=new ArrayList<>();
for (String facCode : facCodes) { for (String facCode : facCodes) {
//buildPBomParent(parent, facCode); //buildPBomParent(parent, facCode);
for (BomNewEbomParentVO vo : parentList) { for (BomNewEbomParentVO vo : parentList) {
String hasConvertKey=StrUtil.join(facCode,vo.getBomRowId());
if(hasConvert.contains(hasConvertKey)){
continue;
}
hasConvert.add(hasConvertKey);
//构建变更明细 //构建变更明细
buildUpgradeChangeDetail(vo,VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE); buildUpgradeChangeDetail(vo,VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE);
buildUpgradeChangeDetail(vo,VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE); buildUpgradeChangeDetail(vo,VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);

6
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 * @return
*/ */
public static String getUserCode() { public static String getUserCode() {
return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QMB07072700"); return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QHI17062100");
} }
/** /**
@ -38,7 +38,7 @@ public class SessionUtil {
* @return * @return
*/ */
public static String getUserName() { public static String getUserName() {
return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserName).orElse(null); return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserName).orElse("郑军榕");
} }
/** /**
@ -51,7 +51,7 @@ public class SessionUtil {
} }
public static String getRealName() { public static String getRealName() {
return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getRealName).orElse(null); return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getRealName).orElse("郑军榕");
} }
public static String getDepartName() { public static String getDepartName() {