From c12050dfeb4390006f2daa6fe1b32f30502fba94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 22 Mar 2024 09:17:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E4=BA=A4=E7=BB=99=E5=89=8D=E7=AB=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewEbomParentService.java | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 52d7e5d4..dbac4065 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -10,7 +10,6 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -24,7 +23,10 @@ import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.mapper.master.BomNewEbomParentMapper; import com.nflg.product.bomnew.pojo.dto.*; -import com.nflg.product.bomnew.pojo.entity.*; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomMaterialUseEntity; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; +import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity; import com.nflg.product.bomnew.pojo.query.BomNewEbomMaterialQuery; import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery; import com.nflg.product.bomnew.pojo.vo.*; @@ -240,8 +242,7 @@ public class BomNewEbomParentService extends ServiceImpl getSelfMaterialNo(Set relSkuNo) { - Set selfParentMaterialNo = this.getBaseMapper().getSelfParentMaterialNo(SessionUtil.getUserCode(), relSkuNo); - return selfParentMaterialNo; + return this.getBaseMapper().getSelfParentMaterialNo(SessionUtil.getUserCode(), relSkuNo); } @@ -256,17 +257,6 @@ public class BomNewEbomParentService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - if (StrUtil.isNotBlank(query.getDrawingNo())) { - wrapper.eq(BomNewEbomChildEntity::getDrawingNo, query.getDrawingNo()); - } else if (StrUtil.isNotBlank(query.getMaterialNo())) { - wrapper.eq(BomNewEbomChildEntity::getMaterialNo, query.getMaterialNo()); - } - if (wrapper.nonEmptyOfWhere() && ebomChildService.getBaseMapper().selectCount(wrapper) > 0) { - VUtils.isTure(true).throwMessage("不存在此BOM物料"); - } } return result; @@ -280,9 +270,7 @@ public class BomNewEbomParentService extends ServiceImpl getUpgradeChangeList(BomNewEbomParentQuery query) { - Page result = this.getBaseMapper().getUpgradeChangeList(new Page<>(query.getPage(), query.getPageSize()), query); - - return result; + return this.getBaseMapper().getUpgradeChangeList(new Page<>(query.getPage(), query.getPageSize()), query); } From 7fe9e5e2be89fd32fcc0d3594a1198269eaff6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 22 Mar 2024 11:29:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=9B=B8=E7=AD=89=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/CheckEBomException.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index d0763a32..c7ec730f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -160,15 +160,15 @@ public class CheckEBomException { } } - if (ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_Q.equals(parent.getProjectType())) { - List qList = child.stream().filter(u -> ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_Q.equals(u.getProjectType())).collect(Collectors.toList()); + if (ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_Q.getValue().equals(parent.getProjectType())) { + List qList = child.stream().filter(u -> ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_Q.getValue().equals(u.getProjectType())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(qList)) { parent.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_9.getValue()); qList.forEach(u -> u.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_9.getValue())); } } - if (ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.equals(parent.getProjectType())) { - List qList = child.stream().filter(u -> ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.equals(u.getProjectType())).collect(Collectors.toList()); + if (ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.getValue().equals(parent.getProjectType())) { + List qList = child.stream().filter(u -> ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.getValue().equals(u.getProjectType())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(qList)) { parent.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_10.getValue()); qList.forEach(u -> u.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_10.getValue())); From 86e49645e2d587a374312255da0400a1e83fea89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 22 Mar 2024 14:05:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ebom=E5=88=A0=E9=99=A4=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=A1=E9=AA=8C=EF=BC=8C=E4=BB=85=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=BE=85=E5=A4=8D=E6=A0=B8=E5=92=8C=E5=B7=B2?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E6=89=8D=E8=83=BD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index dbac4065..874302be 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.TypeReference; import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.EnumUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; @@ -1471,6 +1472,11 @@ public class BomNewEbomParentService extends ServiceImpl Date: Mon, 25 Mar 2024 09:58:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=B8=8E=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=97=A0=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BomEChildServiceImpl.java | 2 +- .../service/impl/BomEParentServiceImpl.java | 10 +++---- .../product/bom/ebom/util/BomEParentUtil.java | 10 +++---- .../impl/BomOriginalParentServiceImpl.java | 14 +++++----- .../impl/BomFactorySplitRuleServiceImpl.java | 10 +++---- .../service/impl/BomPSearchServiceImpl.java | 2 +- .../BomTechnologyTaskFactoryEnum.java | 2 +- .../product/bom/pojo/query/OConvertUtils.java | 2 +- .../ebom/DynamicBomEMiddleDeleteUtil.java | 8 +++--- .../util/ebom/DynamicBomEMiddleEditUtil.java | 26 +++++++++---------- .../MesDynamicInspectStandardServiceImpl.java | 2 +- .../java/com/nflg/product/util/PlmUtilV2.java | 12 ++++----- .../java/com/nflg/product/util/PlmUtils.java | 12 ++++----- .../service/AuthorityDepartmentService.java | 2 +- .../service/AuthorityMenuService.java | 10 +++---- .../material/service/MaterialMainService.java | 2 +- .../service/MaterialUpdateBillService.java | 4 +-- .../service/materialLog/ClassCompareUtil.java | 2 +- .../nflg/product/material/util/PlmUtilV2.java | 12 ++++----- .../nflg/product/material/util/PlmUtils.java | 12 ++++----- .../product/material/util/PlmUtilsV3.java | 8 +++--- .../material/util/query/OConvertUtils.java | 2 +- .../product/bomnew/api/user/BomReportApi.java | 4 +-- .../nflg/product/bomnew/api/user/EbomApi.java | 9 ++----- .../service/BomFactorySplitRuleService.java | 10 +++---- .../service/BomNewEbomParentService.java | 14 +++++----- .../service/BomNewOriginalParentService.java | 13 +++++----- .../service/BomNewPbomParentService.java | 6 ++--- .../product/bomnew/service/CrmService.java | 2 +- .../bomnew/service/SapOpUtilService.java | 3 ++- .../domain/PBom/ConvertToMBom1020.java | 2 +- .../product/bomnew/util/ClassCompareUtil.java | 2 +- .../nflg/product/base/core/api/BaseApi.java | 8 +++--- 33 files changed, 117 insertions(+), 122 deletions(-) diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/service/impl/BomEChildServiceImpl.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/service/impl/BomEChildServiceImpl.java index fea60858..53bfe5b4 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/service/impl/BomEChildServiceImpl.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/service/impl/BomEChildServiceImpl.java @@ -1446,7 +1446,7 @@ public class BomEChildServiceImpl extends ServiceImpl> map = listAllMiddleList.stream().filter(item -> item.getVirtuallyPack() != null).collect(Collectors.groupingBy(BomEMiddleEntity::getVirtuallyPack)); - if (map == null || map.size() <= 0) { + if (map.isEmpty()) { return; } diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/service/impl/BomEParentServiceImpl.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/service/impl/BomEParentServiceImpl.java index a58df263..8d4667f3 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/service/impl/BomEParentServiceImpl.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/service/impl/BomEParentServiceImpl.java @@ -1408,8 +1408,8 @@ public class BomEParentServiceImpl extends ServiceImpl getListOldBomEMiddle(List returnList) { - List listRowId = returnList.stream().filter(item -> item.getORowId() != null).map(BomEParentVO::getORowId).collect(Collectors.toList()); - if (listRowId == null || listRowId.size() <= 0) { + List listRowId = returnList.stream().map(BomEParentVO::getORowId).filter(Objects::nonNull).collect(Collectors.toList()); + if (listRowId.isEmpty()) { return new ArrayList<>(); } @@ -1435,8 +1435,8 @@ public class BomEParentServiceImpl extends ServiceImpl(); } - List listRowId = listBomEMiddle.stream().filter(item -> item.getORowId() != null).map(BomEMiddleEntity::getORowId).collect(Collectors.toList()); - if (listRowId == null || listRowId.size() <= 0) { + List listRowId = listBomEMiddle.stream().map(BomEMiddleEntity::getORowId).filter(Objects::nonNull).collect(Collectors.toList()); + if (listRowId.isEmpty()) { return new HashMap<>(); } @@ -2038,7 +2038,7 @@ public class BomEParentServiceImpl extends ServiceImpl0) { + if (!listNotUser.isEmpty()) { return ResultVO.error("只能删除本人的数据"); } diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/util/BomEParentUtil.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/util/BomEParentUtil.java index 4741bfe0..a54170b0 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/util/BomEParentUtil.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/ebom/util/BomEParentUtil.java @@ -258,14 +258,14 @@ public class BomEParentUtil { } parent.setEditStatus(EditStatusEnum.EDITED.getValue()); //设置为已处理 - List listResult = new ArrayList<>(); + //List listResult = new ArrayList<>(); Map> mapResultGroupByPRowId = listResultTemp.stream().filter(item -> Objects.nonNull(item.getPRowId())).collect(Collectors.groupingBy(BomEParentVO::getPRowId)); - if(mapResultGroupByPRowId == null || mapResultGroupByPRowId.size()==0){ - listResult.add(parent); - } +// if(mapResultGroupByPRowId.isEmpty()){ +// listResult.add(parent); +// } List listChild = mapResultGroupByPRowId.get(parent.getRowId()); - if(listChild == null || listChild.size()==0){ + if(listChild == null || listChild.isEmpty()){ return ; } parent.setChildren(listChild); diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/obom/service/impl/BomOriginalParentServiceImpl.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/obom/service/impl/BomOriginalParentServiceImpl.java index 5b205303..fbbf8510 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/obom/service/impl/BomOriginalParentServiceImpl.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/obom/service/impl/BomOriginalParentServiceImpl.java @@ -228,7 +228,7 @@ public class BomOriginalParentServiceImpl extends ServiceImpl mapMaterialNo = this.bomOParentUtil.getMapMaterialNo(list, bomOriginalChildList); - if(list != null && list.size()>0){ + if(!list.isEmpty()){ list.forEach(item->{ MaterialMainEntity materialMain = mapMaterialNo.get(item.getMaterialNo()); if(materialMain != null){ @@ -239,7 +239,7 @@ public class BomOriginalParentServiceImpl extends ServiceImpl 0) { + if (bomOriginalChildList != null && !bomOriginalChildList.isEmpty()) { bomOriginalChildList.forEach(item -> { MaterialMainEntity materialMain = mapMaterialNo.get(item.getMaterialNo()); if (materialMain != null) { @@ -290,7 +290,7 @@ public class BomOriginalParentServiceImpl extends ServiceImpl mapMaterialNo = this.bomOParentUtil.getMapMaterialNo(list, bomOriginalChildList); - if (list != null && list.size() > 0) { + if (!list.isEmpty()) { list.forEach(item -> { MaterialMainEntity materialMain = mapMaterialNo.get(item.getMaterialNo()); if (materialMain != null) { @@ -301,7 +301,7 @@ public class BomOriginalParentServiceImpl extends ServiceImpl 0) { + if (bomOriginalChildList != null && !bomOriginalChildList.isEmpty()) { bomOriginalChildList.forEach(item -> { MaterialMainEntity materialMain = mapMaterialNo.get(item.getMaterialNo()); if (materialMain != null) { @@ -390,15 +390,15 @@ public class BomOriginalParentServiceImpl extends ServiceImpl 0) { + if (!parentList.isEmpty()) { // status为2=已转换，不允许删除 List parentStatusList = parentList.stream().filter(item -> item.getStatus().compareTo(BomOriginalParentStatusEnum.ALREADY.getValue()) == 0).collect(Collectors.toList()); - if (parentStatusList.size() > 0) { + if (!parentStatusList.isEmpty()) { List statusDrawingNoList = parentStatusList.stream().map(BomOriginalParentEntity::getDrawingNo).collect(Collectors.toList()); return ResultVO.error("图号为" + String.join(",", statusDrawingNoList) + "的数据为已转换的，无法删除"); } List plmParentList = parentList.stream().filter(item -> item.getSource().compareTo(BomOriginalParentSourceEnum.PLM.getValue()) == 0).collect(Collectors.toList()); - if (plmParentList.size() > 0) { + if (!plmParentList.isEmpty()) { List plmDrawingNoList = plmParentList.stream().map(BomOriginalParentEntity::getDrawingNo).collect(Collectors.toList()); return ResultVO.error("图号为" + String.join(",", plmDrawingNoList) + "的父级BOM为PLM导入的，无法删除"); } diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pbom/service/impl/BomFactorySplitRuleServiceImpl.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pbom/service/impl/BomFactorySplitRuleServiceImpl.java index 0be0d841..df26a5e9 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pbom/service/impl/BomFactorySplitRuleServiceImpl.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pbom/service/impl/BomFactorySplitRuleServiceImpl.java @@ -272,8 +272,8 @@ public class BomFactorySplitRuleServiceImpl extends ServiceImpl splitRuleList = new ArrayList<>(); List ruleGroupList = new ArrayList<>(); // 如果规则分组有值，判断规则分组表是否包含该规则分组值 - List ruleGroupNameList = requestList.stream().filter(item->StringUtils.isNotEmpty(item.getRuleGroupName())).map(BomFactorySplitRuleVO::getRuleGroupName).distinct().collect(Collectors.toList()); - if(ruleGroupNameList != null && ruleGroupNameList.size()>0) { + List ruleGroupNameList = requestList.stream().map(BomFactorySplitRuleVO::getRuleGroupName).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); + if(!ruleGroupNameList.isEmpty()) { List ruleGroupEntityList = bomFactoryRuleGroupService.lambdaQuery().in(BomFactoryRuleGroupEntity::getRuleGroupName, ruleGroupNameList).list(); if (CollUtil.isNotEmpty(ruleGroupEntityList)) { ruleGroupList.addAll(ruleGroupEntityList); @@ -286,8 +286,8 @@ public class BomFactorySplitRuleServiceImpl extends ServiceImpl categoryList = new ArrayList<>(); - List categoryCodeList = requestList.stream().filter(item->StringUtils.isNotEmpty(item.getMaterialCategoryCode())).map(BomFactorySplitRuleVO::getMaterialCategoryCode).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); - List nextCategoryCodeList = requestList.stream().filter(item->StringUtils.isNotEmpty(item.getNextMaterialCategoryCode())).map(BomFactorySplitRuleVO::getNextMaterialCategoryCode).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); + List categoryCodeList = requestList.stream().map(BomFactorySplitRuleVO::getMaterialCategoryCode).filter(StringUtils::isNotEmpty).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); + List nextCategoryCodeList = requestList.stream().map(BomFactorySplitRuleVO::getNextMaterialCategoryCode).filter(StringUtils::isNotEmpty).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); List allCategoryCodeList = new ArrayList<>(); if (CollUtil.isNotEmpty(categoryCodeList)) { allCategoryCodeList.addAll(categoryCodeList); @@ -301,7 +301,7 @@ public class BomFactorySplitRuleServiceImpl extends ServiceImpl0) { + if(!categoryList.isEmpty()) { List ccList = categoryList.stream().map(MaterialCategoryEntity::getCategoryCode).collect(Collectors.toList()); List reduceCcList = allCategoryCodeList.stream().filter(item -> !ccList.contains(item)).collect(Collectors.toList()); if (CollUtil.isNotEmpty(reduceCcList)) { diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pbom/service/impl/BomPSearchServiceImpl.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pbom/service/impl/BomPSearchServiceImpl.java index 5222b3d8..a9b3d71b 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pbom/service/impl/BomPSearchServiceImpl.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pbom/service/impl/BomPSearchServiceImpl.java @@ -346,7 +346,7 @@ public class BomPSearchServiceImpl implements BomPSearchService { // bomPParentVO.setId(IdWorker.get32UUID()); // bomPParentVO.setChildren(children); // } - if(parentList ==null || parentList.size()<=0){ + if(parentList.isEmpty()){ MaterialMainEntity materialMain = mapMaterialNo.get(vo.getMaterialNo()); bomPParentUtil.setStatusByParentByA00AndLack(vo, materialMain); //设置缺Bom }else { diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pojo/enums/technology/BomTechnologyTaskFactoryEnum.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pojo/enums/technology/BomTechnologyTaskFactoryEnum.java index 09a12c60..b4be0379 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pojo/enums/technology/BomTechnologyTaskFactoryEnum.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pojo/enums/technology/BomTechnologyTaskFactoryEnum.java @@ -21,7 +21,7 @@ public enum BomTechnologyTaskFactoryEnum { public static BomTechnologyTaskFactoryEnum getDescriptionByValue(Integer value) { for (BomTechnologyTaskFactoryEnum valueEnum : BomTechnologyTaskFactoryEnum.values()) { - if (valueEnum.getValue().equals(value)) { + if (valueEnum.getValue().equals(value.toString())) { return valueEnum; } } diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pojo/query/OConvertUtils.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pojo/query/OConvertUtils.java index 2520ea21..a41a5c22 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pojo/query/OConvertUtils.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/pojo/query/OConvertUtils.java @@ -111,7 +111,7 @@ public class OConvertUtils { * 如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。
* 例如：hello_world,test_id->helloWorld,testId * - * @param name 转换前的下划线大写方式命名的字符串 + * @param names 转换前的下划线大写方式命名的字符串 * @return 转换后的驼峰式命名的字符串 */ public static String camelNames(String names) { diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/util/ebom/DynamicBomEMiddleDeleteUtil.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/util/ebom/DynamicBomEMiddleDeleteUtil.java index e04072c6..87b7b99b 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/util/ebom/DynamicBomEMiddleDeleteUtil.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/util/ebom/DynamicBomEMiddleDeleteUtil.java @@ -35,18 +35,18 @@ public class DynamicBomEMiddleDeleteUtil { BomEMiddleEntity bomEMiddle = middleEntityList.get(0); Long parentRowId = bomEMiddle.getParentRowId(); - List listMaterialNo = middleEntityList.stream().filter(item -> StringUtils.isNotEmpty(item.getMaterialNo())).map(BomEMiddleEntity::getMaterialNo).distinct().collect(Collectors.toList()); - if(listMaterialNo == null || listMaterialNo.size()<=0){ + List listMaterialNo = middleEntityList.stream().map(BomEMiddleEntity::getMaterialNo).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); + if(listMaterialNo.size()<=0){ return; } - List listRowIds = middleEntityList.stream().filter(item -> item.getRowId()!= null).map(BomEMiddleEntity::getRowId).distinct().collect(Collectors.toList()); + List listRowIds = middleEntityList.stream().map(BomEMiddleEntity::getRowId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); List listDelete = this.getListDelete(listRowIds, listMaterialNo); if(listDelete == null || listDelete.size()<=0){ return; } - List listParentRowId = listDelete.stream().filter(item -> item.getParentRowId() != null).map(BomEMiddleEntity::getParentRowId).distinct().collect(Collectors.toList()); + List listParentRowId = listDelete.stream().map(BomEMiddleEntity::getParentRowId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); Map> mapByParentRowId = this.getMapDeleteGroupByParentRowId(listParentRowId); List listResultDelete = new ArrayList<>(); diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/util/ebom/DynamicBomEMiddleEditUtil.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/util/ebom/DynamicBomEMiddleEditUtil.java index 7a920ede..9bc59335 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/util/ebom/DynamicBomEMiddleEditUtil.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/bom/util/ebom/DynamicBomEMiddleEditUtil.java @@ -207,7 +207,7 @@ public class DynamicBomEMiddleEditUtil { private List getNotChildList(String title, List middleList, List listChild) { String titleChild = title + "4.0 [getNotChildList] "; Map> mapByPRowId = listChild.stream().filter(item -> Objects.nonNull(item.getPRowId())).collect(Collectors.groupingBy(BomEMiddleEntity::getPRowId)); - if (mapByPRowId == null || mapByPRowId.size() <= 0) { + if (mapByPRowId.isEmpty()) { // log.info(titleChild + "没有下级信息，所有的节点没有下级，返回全部节点"); return middleList; } @@ -230,10 +230,10 @@ public class DynamicBomEMiddleEditUtil { private void getNotChildListTree(String title, BomEMiddleEntity item, Map> mapByPRowId, List listYesChild) { List list = mapByPRowId.get(item.getRowId()); - if (list == null || list.size() == 0) { + if (list == null || list.isEmpty()) { // log.info(title + " 没有对应的下级节点"); // 无下级BOM状态设置 - if(listYesChild.size()>0) { + if(!listYesChild.isEmpty()) { // log.error("___________________无下级BOM状态设置:"+listYesChild.get(listYesChild.size() - 1).getRowId()); listYesChild.get(listYesChild.size() - 1).setChildBomStatus(BomEParentChildBomStatusEnum.NO.getValue()); } @@ -418,17 +418,17 @@ public class DynamicBomEMiddleEditUtil { private Map> getMapAllByParentRowId(String titleChild, List listMaterialNoCurtMiddle, List listMaterialNoCurtParent) { long startTime = System.currentTimeMillis(); List listParentRowId = new ArrayList<>(); - if (listMaterialNoCurtMiddle != null && listMaterialNoCurtMiddle.size() > 0) { + if (listMaterialNoCurtMiddle != null && !listMaterialNoCurtMiddle.isEmpty()) { for (BomEMiddleEntity item : listMaterialNoCurtMiddle) { listParentRowId.add(item.getParentRowId()); } } - if (listMaterialNoCurtParent != null && listMaterialNoCurtParent.size() > 0) { + if (listMaterialNoCurtParent != null && !listMaterialNoCurtParent.isEmpty()) { for (BomEParentEntity item : listMaterialNoCurtParent) { listParentRowId.add(item.getRowId()); } } - if (listParentRowId == null || listParentRowId.size() <= 0) { + if (listParentRowId.isEmpty()) { // log.info(titleChild + "【getMapAllByParentRowId】listParentRowId为空"); return new HashMap<>(); } @@ -485,7 +485,7 @@ public class DynamicBomEMiddleEditUtil { } Map> map = listBomEMiddle.stream().filter(obj -> Objects.nonNull(obj.getPRowId())).collect(Collectors.groupingBy(BomEMiddleEntity::getPRowId)); - if (map == null || map.size() <= 0) { + if (map.isEmpty()) { // log.info(titleChildChildItem + "子节点数据PRowId都为空"); continue; } @@ -551,7 +551,7 @@ public class DynamicBomEMiddleEditUtil { } Map> map = listBomEMiddle.stream().filter(obj -> Objects.nonNull(obj.getPRowId())).collect(Collectors.groupingBy(BomEMiddleEntity::getPRowId)); - if (map == null || map.size() <= 0) { + if (map.isEmpty()) { // log.info(titleChildChildItem + "子节点数据PRowId都为空"); continue; } @@ -714,14 +714,14 @@ public class DynamicBomEMiddleEditUtil { } Map> map = list.stream().filter(obj -> Objects.nonNull(obj.getPRowId())).collect(Collectors.groupingBy(BomEMiddleEntity::getPRowId)); - if (map == null || map.size() <= 0) { + if (map.isEmpty()) { // log.info(titleChild + " map所有下级节点为空"); return new HashMap<>(); } List listResult = new ArrayList<>(); this.getListCurtTree(titleChild, rowId, map, listResult); - if (listResult == null || listResult.size() <= 0) { + if (listResult.isEmpty()) { // log.info(titleChild + " 组装所有下级节点为空_2"); return new HashMap<>(); } @@ -844,7 +844,7 @@ public class DynamicBomEMiddleEditUtil { this.saveOtherParentRootTreeChild(titleChild, item.getRowId(), itemNew.getRowId(), root.getRowId(), mapCurt, listResult); } - if (listResult == null || listResult.size() <= 0) { + if (listResult.isEmpty()) { // log.info(titleChild + "当前节点[" + rowId + "]没有需要保存的数据"); return new ArrayList<>(); } @@ -936,7 +936,7 @@ public class DynamicBomEMiddleEditUtil { } Map> mapCur = list.stream().filter(obj -> Objects.nonNull(obj.getPRowId())).collect(Collectors.groupingBy(BomEMiddleEntity::getPRowId)); - if (mapCur == null || mapCur.size() <= 0) { + if (mapCur.isEmpty()) { log.info(titleChild + "按照上级节点转换成map为空"); return listResult; } @@ -1006,7 +1006,7 @@ public class DynamicBomEMiddleEditUtil { this.saveOtherMiddleRootTreeChild(titleChild, item.getRowId(), itemNew.getRowId(), root.getParentRowId(), mapCurt, listResult); } - if (listResult == null || listResult.size() <= 0) { + if (listResult.isEmpty()) { // log.info(titleChild + "当前节点[" + rowId + "]没有需要保存的数据"); return; } diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/mes/service/impl/MesDynamicInspectStandardServiceImpl.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/mes/service/impl/MesDynamicInspectStandardServiceImpl.java index 73336338..7ffa4d0e 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/mes/service/impl/MesDynamicInspectStandardServiceImpl.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/mes/service/impl/MesDynamicInspectStandardServiceImpl.java @@ -766,7 +766,7 @@ public class MesDynamicInspectStandardServiceImpl extends ServiceImpl 0) { + if (!UserDepartmentIds.isEmpty()) { for (int x = 0, UserDeptSize = UserDepartmentIds.size(); x < UserDeptSize; x++) { Map tempMap = (Map) UserDepartmentIds.get(x); String user2deptId = (String) tempMap.get(DomainConstants.SELECT_ID); @@ -331,7 +331,7 @@ public class PlmUtilV2 { System.out.println("------------------draw2Org:" + draw2Org); - if (draw2Org.size() > 0) { + if (!draw2Org.isEmpty()) { for (int j = 0; j < draw2Org.size(); j++) { java.util.Map orgMap = (java.util.Map) draw2Org.get(j); String orgId = (String) orgMap.get("id"); diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/util/PlmUtils.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/util/PlmUtils.java index 740149b0..90b65f01 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/util/PlmUtils.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/util/PlmUtils.java @@ -122,16 +122,16 @@ public class PlmUtils { mql.executeCommand(context, "print bus Person '" + strContextUser + "' - select id;"); String strContextUserperson = mql.getResult().trim(); - if (strContextUserperson == null || strContextUserperson == "" || !strContextUserperson.contains("=")) { + if (!strContextUserperson.contains("=")) { return false; } - String strContextUserpersonreal = strContextUserperson.substring(strContextUserperson.indexOf("=") + 2, strContextUserperson.length()); + String strContextUserpersonreal = strContextUserperson.substring(strContextUserperson.indexOf("=") + 2); //图纸对应的部门的部门id值 mql.executeCommand(context, "print bus '" + objectId + "' select to[OrganizationToDrawing].from.id dump;"); String busID = mql.getResult().trim(); - if (busID == null || busID == "") { + if (busID.equals("")) { return false; } @@ -143,7 +143,7 @@ public class PlmUtils { mql.executeCommand(context, "print bus '" + objectId + "' select owner dump;"); String busOwner = mql.getResult().trim(); - if (busID == null || busID == "") { + if (busOwner.equals("")) { return false; } @@ -212,7 +212,7 @@ public class PlmUtils { DomainObject userobj = new DomainObject(loginUserId); MapList UserDepartmentIds = userobj.getRelatedObjects(context, "Member", "*", busItem, null, true, false, (short) 1, null, null); - if (UserDepartmentIds.size() > 0) { + if (!UserDepartmentIds.isEmpty()) { for (int x = 0, UserDeptSize = UserDepartmentIds.size(); x < UserDeptSize; x++) { Map tempMap = (Map) UserDepartmentIds.get(x); String user2deptId = (String) tempMap.get(DomainConstants.SELECT_ID); @@ -223,7 +223,7 @@ public class PlmUtils { DomainObject drawobj = new DomainObject(objectId); MapList draw2Org = drawobj.getRelatedObjects(context, "OrganizationToDrawing", "*", busItem, null, true, false, (short) 1, null, null); - if (draw2Org.size() > 0) { + if (!draw2Org.isEmpty()) { for (int j = 0; j < draw2Org.size(); j++) { java.util.Map orgMap = (java.util.Map) draw2Org.get(j); String orgId = (String) orgMap.get("id"); diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/AuthorityDepartmentService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/AuthorityDepartmentService.java index 9903686f..479da832 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/AuthorityDepartmentService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/AuthorityDepartmentService.java @@ -92,7 +92,7 @@ public class AuthorityDepartmentService extends ServiceImpl builderDepartmentTree(List datas){ List first = datas.stream().filter(u -> u.getParentRowId()==0).collect(Collectors.toList()); - if(!Objects.isNull(first)) { + if(!first.isEmpty()) { for (AuthorityDepartmentVO depart : first) { TreeUtil.buildTree(depart, AuthorityDepartmentVO::getParentRowId, AuthorityDepartmentVO::getRowId, datas, AuthorityDepartmentVO::setChildren); } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/AuthorityMenuService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/AuthorityMenuService.java index 49757f7c..d2ba6584 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/AuthorityMenuService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/AuthorityMenuService.java @@ -285,13 +285,13 @@ public class AuthorityMenuService extends ServiceImpl subMenuNodes = datas.stream().filter(u -> u.getParentRowId().equals(menu.getParentRowId())).collect(Collectors.toList()); - if (!Objects.isNull(subMenuNodes) && subMenuNodes.size() > 0) { - int min = subMenuNodes.stream().mapToInt(u -> u.getSelectedType()).min().getAsInt(); - int max = subMenuNodes.stream().mapToInt(u -> u.getSelectedType()).max().getAsInt(); + if (!subMenuNodes.isEmpty()) { + int min = subMenuNodes.stream().mapToInt(AuthorityMenuVO::getSelectedType).min().getAsInt(); + int max = subMenuNodes.stream().mapToInt(AuthorityMenuVO::getSelectedType).max().getAsInt(); if(min>0){ menuMp.get(menu.getParentRowId()).setSelectedType(max); } - else if (min<=0 && max<=0){ + else if (max<=0){ menuMp.get(menu.getParentRowId()).setSelectedType(0); } else { @@ -305,7 +305,7 @@ public class AuthorityMenuService extends ServiceImpl 0) { + if (!result.isEmpty()) { buildParentMenuPermissionTag(datas, result, menuMp); } } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java index b976f4d8..9395e3de 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java @@ -728,7 +728,7 @@ public class MaterialMainService extends ServiceImpl extList = materialMainExtService.lambdaQuery().in(MaterialMainExtEntity::getMaterialRowId, materialRowIds).list(); Map extMp = ListCommonUtil.listToMap(extList, MaterialMainExtEntity::getMaterialRowId); // 有子类别，说明不是最小类，只保留三个值，001，002，replenish（把进描述的，写进去） - if (childList != null && childList.size() > 0) { + if (childList != null && !childList.isEmpty()) { list.forEach(k -> { if (extMp.containsKey(k.get("rowId"))) { List attrs = JSON.parseArray(extMp.get(k.get("rowId")).getMaterialExt(), MaterialMainAttrDTO.class); diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java index 93bf53fc..e4d9f024 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java @@ -664,14 +664,14 @@ public class MaterialUpdateBillService extends ServiceImpl materialNos) { - List collect = materialNos.stream().filter(i -> i != "") // list 对应的 Stream 并过滤"" + List collect = materialNos.stream().filter(i -> !Objects.equals(i, "")) // list 对应的 Stream 并过滤"" .collect(Collectors.toMap(e -> e, e -> 1, Integer::sum)) // 获得元素出现频率的 Map，键为元素，值为元素出现的次数 .entrySet() .stream() // 所有 entry 对应的 Stream .filter(e -> e.getValue() > 1) // 过滤出元素出现次数大于 1 (重复元素）的 entry .map(Map.Entry::getKey) // 获得 entry 的键（重复元素）对应的 Stream .collect(Collectors.toList()); - if (collect.size() > 0) { + if (!collect.isEmpty()) { throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", collect).concat("物料编码重复")); } } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/materialLog/ClassCompareUtil.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/materialLog/ClassCompareUtil.java index 10671b4f..ea4a3623 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/materialLog/ClassCompareUtil.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/materialLog/ClassCompareUtil.java @@ -67,7 +67,7 @@ public class ClassCompareUtil { if (oldValue == null && newValue == null) { continue; - } else if (oldValue == null && newValue != null) { + } else if (oldValue == null) { Map valueMap = new HashMap(16); valueMap.put("oldValue", oldValue); valueMap.put("newValue", newValue); diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtilV2.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtilV2.java index 8943dc9e..056bf11e 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtilV2.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtilV2.java @@ -224,10 +224,10 @@ public class PlmUtilV2 { //System.out.println(strContextUserperson==null); //System.out.println(strContextUserperson==""); //System.out.println(strContextUserperson.startsWith("")); - if (strContextUserperson==null||strContextUserperson==""||!strContextUserperson.contains("=")){ + if (!strContextUserperson.contains("=")){ return false; } - String strContextUserpersonreal = strContextUserperson.substring(strContextUserperson.indexOf("=") + 2, strContextUserperson.length()); + String strContextUserpersonreal = strContextUserperson.substring(strContextUserperson.indexOf("=") + 2); System.out.println("--"+strContextUserpersonreal+"--"); @@ -236,7 +236,7 @@ public class PlmUtilV2 { String busID=mql.getResult().trim(); System.out.println("busID--wjctest:"+busID); - if (busID==null||busID==""){ + if (busID.equals("")){ return false; } @@ -252,7 +252,7 @@ public class PlmUtilV2 { String busOwner=mql.getResult().trim(); System.out.println("------------------busOwner:" +busOwner); - if (busID==null||busID==""){ + if (busOwner.equals("")){ return false; } @@ -365,7 +365,7 @@ public class PlmUtilV2 { MapList UserDepartmentIds=userobj.getRelatedObjects(context,"Member","*",busItem,null,true,false,(short)1,null,null); System.out.println("-------------UserDepartmentIds:"+UserDepartmentIds); - if(UserDepartmentIds.size() > 0 ){ + if(!UserDepartmentIds.isEmpty()){ for(int x = 0,UserDeptSize = UserDepartmentIds.size();x < UserDeptSize; x++){ Map tempMap = (Map)UserDepartmentIds.get(x); String user2deptId = (String)tempMap.get(DomainConstants.SELECT_ID); @@ -381,7 +381,7 @@ public class PlmUtilV2 { System.out.println("------------------draw2Org:" +draw2Org); - if(draw2Org.size() > 0 ){ + if(!draw2Org.isEmpty()){ for (int j = 0; j < draw2Org.size(); j++) { java.util.Map orgMap = (java.util.Map)draw2Org.get(j); String orgId = (String)orgMap.get("id"); diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtils.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtils.java index 449630ed..ccaedfcd 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtils.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtils.java @@ -131,16 +131,16 @@ public class PlmUtils { mql.executeCommand(context, "print bus Person '" + strContextUser + "' - select id;"); String strContextUserperson = mql.getResult().trim(); - if (strContextUserperson == null || strContextUserperson == "" || !strContextUserperson.contains("=")) { + if (!strContextUserperson.contains("=")) { return false; } - String strContextUserpersonreal = strContextUserperson.substring(strContextUserperson.indexOf("=") + 2, strContextUserperson.length()); + String strContextUserpersonreal = strContextUserperson.substring(strContextUserperson.indexOf("=") + 2); //图纸对应的部门的部门id值 mql.executeCommand(context, "print bus '" + objectId + "' select to[OrganizationToDrawing].from.id dump;"); String busID = mql.getResult().trim(); - if (busID == null || busID == "") { + if (busID.equals("")) { return false; } @@ -152,7 +152,7 @@ public class PlmUtils { mql.executeCommand(context, "print bus '" + objectId + "' select owner dump;"); String busOwner = mql.getResult().trim(); - if (busID == null || busID == "") { + if (busOwner.equals("")) { return false; } @@ -227,7 +227,7 @@ public class PlmUtils { DomainObject userobj = new DomainObject(loginUserId); MapList UserDepartmentIds = userobj.getRelatedObjects(context, "Member", "*", busItem, null, true, false, (short) 1, null, null); - if (UserDepartmentIds.size() > 0) { + if (!UserDepartmentIds.isEmpty()) { for (int x = 0, UserDeptSize = UserDepartmentIds.size(); x < UserDeptSize; x++) { Map tempMap = (Map) UserDepartmentIds.get(x); String user2deptId = (String) tempMap.get(DomainConstants.SELECT_ID); @@ -239,7 +239,7 @@ public class PlmUtils { MapList draw2Org = drawobj.getRelatedObjects(context, "OrganizationToDrawing", "*", busItem, null, true, false, (short) 1, null, null); - if (draw2Org.size() > 0) { + if (!draw2Org.isEmpty()) { for (int j = 0; j < draw2Org.size(); j++) { java.util.Map orgMap = (java.util.Map) draw2Org.get(j); String orgId = (String) orgMap.get("id"); diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtilsV3.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtilsV3.java index f89f27b1..e7c235b3 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtilsV3.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/PlmUtilsV3.java @@ -306,10 +306,10 @@ public class PlmUtilsV3 { //System.out.println(strContextUserperson==null); //System.out.println(strContextUserperson==""); //System.out.println(strContextUserperson.startsWith("")); - if (strContextUserperson == null || strContextUserperson == "" || !strContextUserperson.contains("=")) { + if (!strContextUserperson.contains("=")) { return false; } - String strContextUserpersonreal = strContextUserperson.substring(strContextUserperson.indexOf("=") + 2, strContextUserperson.length()); + String strContextUserpersonreal = strContextUserperson.substring(strContextUserperson.indexOf("=") + 2); System.out.println("--" + strContextUserpersonreal + "--"); @@ -318,7 +318,7 @@ public class PlmUtilsV3 { String busID = mql.getResult().trim(); System.out.println("busID--wjctest:" + busID); - if (busID == null || busID == "") { + if (busID.equals("")) { return false; } @@ -334,7 +334,7 @@ public class PlmUtilsV3 { String busOwner = mql.getResult().trim(); System.out.println("------------------busOwner:" + busOwner); - if (busID == null || busID == "") { + if (busOwner.equals("")) { return false; } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/query/OConvertUtils.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/query/OConvertUtils.java index ce363c7a..2b00682a 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/query/OConvertUtils.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/query/OConvertUtils.java @@ -111,7 +111,7 @@ public class OConvertUtils { * 如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。
* 例如：hello_world,test_id->helloWorld,testId * - * @param name 转换前的下划线大写方式命名的字符串 + * @param names 转换前的下划线大写方式命名的字符串 * @return 转换后的驼峰式命名的字符串 */ public static String camelNames(String names) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java index 7a45fa31..e91e1583 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java @@ -160,11 +160,11 @@ public class BomReportApi extends BaseApi { ResultVO resultBom2VO = checkQueryParam(query.getRight()); if (resultBom1VO != null) { - new NflgBusinessException(STATE.Error, resultBom1VO.getMsg()); + throw new NflgBusinessException(STATE.Error, resultBom1VO.getMsg()); } if (resultBom2VO != null) { - new NflgBusinessException(STATE.Error, resultBom1VO.getMsg()); + throw new NflgBusinessException(STATE.Error, resultBom2VO.getMsg()); } EecExcelUtil.setResponseExcelHeader(response, "BOM比对"); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java index 42995f0f..c4b166ab 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.ImmutableList; -import com.mzt.logapi.context.LogRecordContext; import com.mzt.logapi.starter.annotation.LogRecord; import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.base.core.conmon.util.SessionUtil; @@ -290,9 +289,7 @@ public class EbomApi extends BaseApi { VUtils.isTure(true ).throwMessage("bomRowId不能为空"); } - ResultVO resultVO = new ResultVO(); - resultVO.setData(bomNewEbomParentService.editDetail(rowId,bomRowId,projectType)); - return resultVO; + return ResultVO.success(bomNewEbomParentService.editDetail(rowId,bomRowId,projectType)); } @PostMapping("updateProjectType") @@ -341,9 +338,7 @@ public class EbomApi extends BaseApi { @ApiOperation("删除物料") @LogRecord(success = "Ebom-删除物料,物料编码：{{#bom.materialNo}}-版本：{{#bom.currentVersion}},操作结果:{{#_ret}}", bizNo = "{{#bomRowId}}",type = "Ebom-删除物料") public ResultVO deleteBom(@RequestParam("bomRowId") Long bomRowId ) throws ExecutionException, InterruptedException{ - bomNewEbomParentService.deleteBom(bomRowId); - - return ResultVO.success(true); + return ResultVO.success(bomNewEbomParentService.deleteBom(bomRowId)); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomFactorySplitRuleService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomFactorySplitRuleService.java index 5a849d75..be4a1774 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomFactorySplitRuleService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomFactorySplitRuleService.java @@ -267,8 +267,8 @@ public class BomFactorySplitRuleService extends ServiceImpl splitRuleList = new ArrayList<>(); List ruleGroupList = new ArrayList<>(); // 如果规则分组有值，判断规则分组表是否包含该规则分组值 - List ruleGroupNameList = requestList.stream().filter(item->StringUtils.isNotEmpty(item.getRuleGroupName())).map(BomFactorySplitRuleVO::getRuleGroupName).distinct().collect(Collectors.toList()); - if(ruleGroupNameList != null && ruleGroupNameList.size()>0) { + List ruleGroupNameList = requestList.stream().map(BomFactorySplitRuleVO::getRuleGroupName).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); + if(!ruleGroupNameList.isEmpty()) { List ruleGroupEntityList = bomFactoryRuleGroupService.lambdaQuery().in(BomFactoryRuleGroupEntity::getRuleGroupName, ruleGroupNameList).list(); if (CollUtil.isNotEmpty(ruleGroupEntityList)) { ruleGroupList.addAll(ruleGroupEntityList); @@ -281,8 +281,8 @@ public class BomFactorySplitRuleService extends ServiceImpl categoryList = new ArrayList<>(); - List categoryCodeList = requestList.stream().filter(item->StringUtils.isNotEmpty(item.getMaterialCategoryCode())).map(BomFactorySplitRuleVO::getMaterialCategoryCode).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); - List nextCategoryCodeList = requestList.stream().filter(item->StringUtils.isNotEmpty(item.getNextMaterialCategoryCode())).map(BomFactorySplitRuleVO::getNextMaterialCategoryCode).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); + List categoryCodeList = requestList.stream().map(BomFactorySplitRuleVO::getMaterialCategoryCode).filter(StringUtils::isNotEmpty).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); + List nextCategoryCodeList = requestList.stream().map(BomFactorySplitRuleVO::getNextMaterialCategoryCode).filter(StringUtils::isNotEmpty).filter(StringUtils::isNotEmpty).distinct().collect(Collectors.toList()); List allCategoryCodeList = new ArrayList<>(); if (CollUtil.isNotEmpty(categoryCodeList)) { allCategoryCodeList.addAll(categoryCodeList); @@ -296,7 +296,7 @@ public class BomFactorySplitRuleService extends ServiceImpl0) { + if(!categoryList.isEmpty()) { List ccList = categoryList.stream().map(MaterialCategoryEntity::getCategoryCode).collect(Collectors.toList()); List reduceCcList = allCategoryCodeList.stream().filter(item -> !ccList.contains(item)).collect(Collectors.toList()); if (CollUtil.isNotEmpty(reduceCcList)) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 874302be..f97e9bab 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -153,17 +153,17 @@ public class BomNewEbomParentService extends ServiceImpl handSeachToTree(List parents, List childs) { Page resutlData = new Page<>(); - Set parentSet = parents.stream().map(u -> u.getMaterialNo()).collect(Collectors.toSet()); - Set childSet = childs.stream().map(u -> u.getMaterialNo()).collect(Collectors.toSet()); + Set parentSet = parents.stream().map(BaseMaterialVO::getMaterialNo).collect(Collectors.toSet()); + Set childSet = childs.stream().map(BaseMaterialVO::getMaterialNo).collect(Collectors.toSet()); Set difference = Sets.difference(parentSet, childSet); List resultParents = parents.stream().filter(u -> difference.contains(u.getMaterialNo())).collect(Collectors.toList()); resutlData.setTotal(difference.size()); resutlData.setSize(difference.size()); resutlData.setPages(1); resutlData.setCurrent(1L); - List all = new ArrayList<>(); +// List all = new ArrayList<>(); // all.addAll(resultParents); - all.addAll(childs); +// all.addAll(childs); List result = new ArrayList<>(); for (BomNewEbomParentVO vo : resultParents) { vo.setParentRowId(-1L); @@ -317,11 +317,11 @@ public class BomNewEbomParentService extends ServiceImpl parentEntity.getStatus()) { + if (parentEntity.getStatus().equals(EBomStatusEnum.PUBLISHED.getValue())) { child.setStatus(EBomStatusEnum.BORROWED_PARTS.getValue()); } //非本人则为借用件 - if (!parentEntity.getCreatedBy().equals(child.getCreatedBy()) && EBomStatusEnum.PUBLISHED.getValue() > parentEntity.getStatus()) { + else if (!parentEntity.getCreatedBy().equals(child.getCreatedBy())) { child.setStatus(EBomStatusEnum.REFERENCE.getValue()); } @@ -452,7 +452,7 @@ public class BomNewEbomParentService extends ServiceImpl all = new ArrayList<>(); +// List all = new ArrayList<>(); // all.addAll(resultParents); - all.addAll(childs); +// all.addAll(childs); List result = new ArrayList<>(); for (BomOriginalListVO vo : resultParents) { vo.setParentRowId(-1L); @@ -237,7 +238,7 @@ public class BomNewOriginalParentService extends ServiceImpl parentChild = this.getBaseMapper().getParentChild(rowId); materialMainService.intiMaterialInfo(parentChild); if (CollUtil.isNotEmpty(parentChild)) { - List drawingNos = parentChild.stream().map(u -> u.getDrawingNo()).collect(Collectors.toList()); + List drawingNos = parentChild.stream().map(BaseMaterialVO::getDrawingNo).collect(Collectors.toList()); if (CollUtil.isNotEmpty(drawingNos)) { List list = this.lambdaQuery().in(BomNewOriginalParentEntity::getDrawingNo, drawingNos) .eq(OriginalStatusEnum.UN_CONVERT.equalsValue(parent.getStatus()),BomNewOriginalParentEntity::getLastVersionIs, 1) @@ -258,16 +259,16 @@ public class BomNewOriginalParentService extends ServiceImpl all = new ArrayList<>(); +// List all = new ArrayList<>(); // all.addAll(resultParents); - all.addAll(childs); +// all.addAll(childs); List result = new ArrayList<>(); for (BomNewPbomParentVO vo : resultParents) { vo.setParentRowId(-1L); @@ -952,7 +952,7 @@ public class BomNewPbomParentService extends ServiceImpl booleanResultVO = sapOpUtilService.importToSap(importParm); - VUtils.isTure(!booleanResultVO.getState().equals(STATE.Success)).throwMessage("同步SAP失败：" + booleanResultVO.getMsg()); + VUtils.isTure(!booleanResultVO.getState().equals(STATE.Success.getState())).throwMessage("同步SAP失败：" + booleanResultVO.getMsg()); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CrmService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CrmService.java index dcb7f717..5552e93f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CrmService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CrmService.java @@ -77,7 +77,7 @@ public class CrmService { String orderResult = httpUtils.doPost(NacosConfig.getNacosConfig().getCrmOrderUrl(), JSON.toJSONString(reBody), token); JSONObject jsonObject = JSONObject.parseObject(orderResult); String code = jsonObject.getString("code"); - if (code == "0") { + if (Objects.equals(code, "0")) { String orderMap = jsonObject.getString("orderMap"); if (StrUtil.isNotBlank(orderMap)) { JSONObject order = JSONObject.parseObject(orderMap); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java index be0e1ab4..006e4aa1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java @@ -23,6 +23,7 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; @Service @@ -125,7 +126,7 @@ public class SapOpUtilService { log.info("PBOM导入到SAP--返回值：" + JSON.toJSONString(exportMap)); String eErrmsg = String.valueOf(exportMap.get("E_ERRMSG")); - if (StrUtil.isNotEmpty(eErrmsg) && eErrmsg!="null") { + if (StrUtil.isNotEmpty(eErrmsg) && !Objects.equals(eErrmsg, "null")) { return ResultVO.error(STATE.Error, eErrmsg); } } catch (Exception e) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom1020.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom1020.java index e309d52c..b8004c7a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom1020.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom1020.java @@ -91,7 +91,7 @@ public class ConvertToMBom1020 extends ConvertToMBomBase{ //非31下的直发包 if (!item.getParentRowId().equals(parent.getRowId())) { ConvertToMBomDTO parentNode = getParent(item.getParentRowId(), EBomConstant.XIAN_TAO_FACTORY_CODE_1020); - if (VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(parentNode.getVirtualPartType()) && parentNode.getRowId() != directDeliveryPackage.getRowId()) { + if (VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(parentNode.getVirtualPartType()) && !Objects.equals(parentNode.getRowId(), directDeliveryPackage.getRowId())) { handlerDirectDeliveryPackage(item, EBomConstant.XIAN_TAO_FACTORY_CODE_1020, directDeliveryPackage); } else { handlerMaterial(item, EBomConstant.XIAN_TAO_FACTORY_CODE_1020); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/ClassCompareUtil.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/ClassCompareUtil.java index d6dbcfef..5c305b4f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/ClassCompareUtil.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/ClassCompareUtil.java @@ -67,7 +67,7 @@ public class ClassCompareUtil { if (oldValue == null && newValue == null) { continue; - } else if (oldValue == null && newValue != null) { + } else if (oldValue == null) { Map valueMap = new HashMap(16); valueMap.put("oldValue", oldValue); valueMap.put("newValue", newValue); diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java index 1e796c51..0df6bb54 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java @@ -25,16 +25,14 @@ public class BaseApi { @ModelAttribute private void initLoginInfo(HttpServletRequest request) { try { - String token = request.getHeader("authorization").toString(); - String language=Objects.nonNull(request.getHeader("language"))? request.getHeader("language").toString():"zh_cn"; + String token = request.getHeader("authorization"); + String language=Objects.nonNull(request.getHeader("language"))? request.getHeader("language") :"zh_cn"; ResultVO result = JwtUtil.parse(token); if (result.getState().equals(STATE.Success.getState())) { LoginUserInfoDTO userInfo = (LoginUserInfoDTO) result.getData(); userInfo.setSessionKey(token); userInfo.setLanguage(language); - if (!Objects.isNull(userInfo)) { - loginUser.set(userInfo); - } + loginUser.set(userInfo); } } catch (Exception ex) { // throw new NflgBusinessException(STATE.SystemErr,"token 解析出错"); From 9991a150ee91044470d5fd818573442ba405401e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 25 Mar 2024 17:35:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1=E3=80=81=E5=8D=87=E7=BA=A7=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java index 443bdcca..35361172 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java @@ -67,7 +67,7 @@ public class PBomUpgrade { */ private void check() { List waitPublishList = SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, root.getMaterialNo()) - .eq(BomNewPbomParentEntity::getFacCode, root.getMaterialNo()) + .eq(BomNewPbomParentEntity::getFacCode, root.getFacCode()) .lt(BomNewPbomParentEntity::getStatus, PBomStatusEnum.PUBLISH.getValue()).list(); VUtils.isTure(CollUtil.isNotEmpty(waitPublishList)).throwMessage(root.getMaterialNo() + "存在待发布的版本，无法升级"); }