From 74ff1fd5e356ae28187c5eef68918aac32dbb503 Mon Sep 17 00:00:00 2001 From: jing's Date: Mon, 12 Aug 2024 09:53:42 +0800 Subject: [PATCH 01/15] =?UTF-8?q?bom=20=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewEbomParentService.java | 4 + .../service/BomNewPbomParentService.java | 2 + .../product/bomnew/util/BomNewSortUtil.java | 74 +++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/BomNewSortUtil.java 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 060cce06..516b3bf2 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 @@ -359,6 +359,9 @@ public class BomNewEbomParentService extends ServiceImpl list, int sort) { + if (CollUtil.isEmpty(list)) { + return; + } + + CollUtil.sort(list, new Comparator() { + @Override + public int compare(BomNewPbomParentVO o1, BomNewPbomParentVO o2) { + + + return sortOrderNum(o1.getOrderNumber(),o2.getOrderNumber(),sort); + + } + }); + } + + + /** + * @param list + * @param sort + */ + public static void orderNumEbomSort(List list, int sort) { + + if (CollUtil.isEmpty(list)) { + return; + } + + CollUtil.sort(list, new Comparator() { + @Override + public int compare(BomNewEbomParentVO o1, BomNewEbomParentVO o2) { + + return sortOrderNum(o1.getOrderNumber(),o2.getOrderNumber(),sort); + } + }); + + } + + +} From 44f3bf96e118d7a39cda60a5f76424a521a32f97 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Mon, 12 Aug 2024 22:15:58 +0800 Subject: [PATCH 02/15] =?UTF-8?q?EBOM=20PBOM=20SAP=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java | 9 +++++++++ .../product/bomnew/service/BomNewEbomParentService.java | 4 +++- .../product/bomnew/service/BomNewPbomParentService.java | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java index 9221b416..d5428047 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java @@ -6,6 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.ttzero.excel.annotation.ExcelColumn; import java.io.Serializable; +import java.time.LocalDateTime; /** * @author 曹鹏飞 @@ -18,6 +19,14 @@ public class OperationErrorMsgVO extends OperationErrorMsgBaseVO implements Seri @ExcelColumn("所在行") public String primaryKey; + /** + * 创建时间 + */ + + @ApiModelProperty(value = "创建时间") + @ExcelColumn("创建时间") + private LocalDateTime createdTime; + public OperationErrorMsgVO() { } 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 060cce06..1400f253 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 @@ -2812,7 +2812,9 @@ public class BomNewEbomParentService extends ServiceImpl resultList = JSON.parseArray(sapErrorMsgEntity.getData(), OperationErrorMsgVO.class); + resultList.forEach(result -> result.setCreatedTime(sapErrorMsgEntity.getCreatedTime())); + return resultList; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index c2881a2b..d9fed474 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -1568,7 +1568,9 @@ public class BomNewPbomParentService extends ServiceImpl resultList = JSON.parseArray(sapErrorMsgEntity.getData(), OperationErrorMsgVO.class); + resultList.forEach(result -> result.setCreatedTime(sapErrorMsgEntity.getCreatedTime())); + return resultList; } public List getReverseBoms(Long parentRowId) { From 1d2b2e36816e1783a6f6676c862ded36287b4f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Tue, 13 Aug 2024 11:32:46 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=BD=ACPBOM-=E8=A7=A3=E5=86=B3=E7=BC=BA?= =?UTF-8?q?parent=E6=97=B6=E7=89=88=E6=9C=AC=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.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/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 958a4be5..499f73f1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -173,7 +173,7 @@ public abstract class EBomToPbomBase { if (Objects.isNull(oldParent)) { - return buildParentEntity(parentVo, facCode, oldParent, parentVo.getCurrentVersion()); + return buildParentEntity(parentVo, facCode, oldParent, StrUtil.isBlank(parentVo.getCurrentVersion())? VersionUtil.getNextVersion(""):parentVo.getCurrentVersion()); } //pbom 处于工作表 From c15239baff101540389c55794df46a62d2de2afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Tue, 13 Aug 2024 19:03:13 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=BD=ACPBOM-=E7=9B=B4=E5=8F=91=E5=8C=85?= =?UTF-8?q?parent=E4=B8=BAnull=20=E6=97=B6-null=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/domain/EBom/EBomToPbomBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 499f73f1..1515e2ad 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -197,7 +197,8 @@ public abstract class EBomToPbomBase { return null; } else { //pbom-处于正式表 - String bomVersion = VersionUtil.compare(parentVo.getCurrentVersion(), oldParent.getCurrentVersion()) > 0 ? parentVo.getCurrentVersion() : VersionUtil.getNextVersion(oldParent.getCurrentVersion()); + String version=StrUtil.isBlank(parentVo.getCurrentVersion())?VersionUtil.getNextVersion(""):parentVo.getCurrentVersion(); + String bomVersion = VersionUtil.compare(version, oldParent.getCurrentVersion()) > 0 ? version : VersionUtil.getNextVersion(oldParent.getCurrentVersion()); return buildParentEntity(parentVo, facCode, oldParent, bomVersion); } From edb3f88e7f46f632515641353446ad51e13e0d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 14 Aug 2024 11:00:48 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=97=B6=EF=BC=8C=E5=BD=93?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=9B=BE=E5=8F=B7=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewEbomParentService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 990b492a..c3c9a425 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 @@ -2475,7 +2475,8 @@ public class BomNewEbomParentService extends ServiceImpl roots = result.getRecords().stream() - .filter(r -> StrUtil.equals(r.getMaterialNo(), query.getMaterialNo()) || StrUtil.equals(r.getDrawingNo(), query.getDrawingNo())) + .filter(r -> (StrUtil.isNotBlank(query.getMaterialNo()) && StrUtil.equals(r.getMaterialNo(), query.getMaterialNo())) + || (StrUtil.isNotBlank(query.getDrawingNo()) && StrUtil.equals(r.getDrawingNo(), query.getDrawingNo()))) .collect(Collectors.toList()); roots.forEach(this::buildChildren); //从子级开始查找 From 0a3aa2ba263e04bad02c6a38cd4db00b64ca23b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 14 Aug 2024 15:00:12 +0800 Subject: [PATCH 06/15] =?UTF-8?q?fix(dqbom):=20=E5=AF=BC=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E5=8F=96=E5=88=B0=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/service/DQBomImportService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java index aea6e2b9..0a262516 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java @@ -76,6 +76,7 @@ public class DQBomImportService { EecExcelUtil.handlerExcel(file.getInputStream(), DQbomExcelVO.class, this::handlerExcelRow); List datas = excelContextTL.get(); + VUtils.isTure(datas.isEmpty()).throwMessage("未读取到数据，请检查表头是否正确"); List errorMsg = checkExcel(datas); if (!errorMsg.isEmpty()) { From b23e22d9a865107c59a5f1990a9ac5e5ef44c680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Wed, 14 Aug 2024 16:13:41 +0800 Subject: [PATCH 07/15] =?UTF-8?q?F=E6=8F=90=E5=B1=82=E5=90=8E=E9=80=A0?= =?UTF-8?q?=E6=88=90=E7=9A=84=E7=A9=BA=E5=8C=85=E8=A6=81=E9=80=92=E5=BD=92?= =?UTF-8?q?=E5=BE=80=E4=B8=8A=E6=A3=80=E6=9F=A5=E5=88=A0=E9=99=A4-?= =?UTF-8?q?=E5=85=88=E4=B8=8D=E5=8F=91=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/constant/BomConstant.java | 4 ++ .../bomnew/pojo/vo/BomNewEbomParentVO.java | 4 ++ .../service/domain/EBom/EBomToPbomBase.java | 38 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/BomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/BomConstant.java index 04639454..af9ca74d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/BomConstant.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/BomConstant.java @@ -12,4 +12,8 @@ public class BomConstant { public static final String PROJECT_TYPE_TEMPORARY = "T"; public static final String PROJECT_TYPE_TEMPORARY_MATERIAL_NO = "9000000000"; + + + public static final Integer YES=1; + public static final Integer NO=0; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java index 48176edb..197ae3f6 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java @@ -357,6 +357,10 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable { @ApiModelProperty("父级物料RowId") private List parentRowIds=new ArrayList<>(); + + @ApiModelProperty("因子级都为F or Z 项而不转") + private Integer notToPBomForFZ=0; + private static final long serialVersionUID = 1L; @Override diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 1515e2ad..edc84e7e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; +import com.alibaba.excel.enums.BooleanEnum; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -745,14 +746,47 @@ public abstract class EBomToPbomBase { if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && (ImmutableSet.of("F").equals(projectSet) || ImmutableSet.of("F", "Z").equals(projectSet) || ImmutableSet.of("Z").equals(projectSet))) { parentBom.setNoConvertToPBomIs(1); + parentBom.setNotToPBomForFZ(BomConstant.YES); childDelMaterialNos.add(parentBom.getMaterialNo()); } } } } + //递归 F，Z项所有父级 + handlerFZEmptyBom(); } + /** + * 处理子级都是F项的空BOM + */ + private void handlerFZEmptyBom() { + List parentBoms = getParentForAllSubNodeIsNotToPBomForFZ(); + while (CollUtil.isNotEmpty(parentBoms)){ + parentBoms.forEach(u->{ + u.setNoConvertToPBomIs(1); + u.setNotToPBomForFZ(BomConstant.YES); + childDelMaterialNos.add(u.getMaterialNo()); + }); + parentBoms = getParentForAllSubNodeIsNotToPBomForFZ(); + } + } + + + private List getParentForAllSubNodeIsNotToPBomForFZ(){ + Map> parentMp = allBomDetail.stream().filter(u->u.getParentRowId()>0).collect(Collectors.groupingBy(BomNewEbomParentVO::getParentRowId)); + List result=new ArrayList<>(); + parentMp.forEach((k,v)->{ + List parent = allBomDetail.stream().filter(u -> u.getBomRowId().equals(k)).collect(Collectors.toList()); + if(Objects.nonNull(parent) && CollUtil.isNotEmpty(parent) && BomConstant.NO.equals(parent.get(0).getNotToPBomForFZ()) ) { + Optional min = v.stream().min(Comparator.comparingInt(BomNewEbomParentVO::getNotToPBomForFZ)); + if (min.isPresent() && BomConstant.YES.equals(min.get().getNotToPBomForFZ())) { + result.add(parent.get(0)); + } + } + }); + return result; + } /** @@ -770,6 +804,7 @@ public abstract class EBomToPbomBase { if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && (ImmutableSet.of("F").equals(projectSet) || ImmutableSet.of("F", "Z").equals(projectSet) || ImmutableSet.of("Z").equals(projectSet))) { parentBom.setNoConvertToPBomIs(1); + parentBom.setNotToPBomForFZ(BomConstant.YES); childDelMaterialNos.add(parentBom.getMaterialNo()); } } @@ -777,6 +812,9 @@ public abstract class EBomToPbomBase { } + //递归 F，Z项所有父级 + handlerFZEmptyBom(); + } /** From 4315eddefd3d026b71668d0e9fc3755b0e808494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 15 Aug 2024 10:12:14 +0800 Subject: [PATCH 08/15] =?UTF-8?q?fix(dqbom):=20=E4=BF=AE=E5=A4=8D=E8=BD=AC?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E8=A1=A8=E6=97=B6=E5=88=A0=E9=99=A4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/service/DQBomService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java index 518a13f6..2f2a31c1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java @@ -9,6 +9,7 @@ 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.toolkit.IdWorker; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.bomnew.constant.*; @@ -34,7 +35,6 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; /** @@ -616,7 +616,7 @@ public class DQBomService { } else { parent.setCurrentVersion(pp.getCurrentVersion()); bomNewPbomParentService.getBaseMapper().deleteById(pp.getRowId()); - bomNewPbomChildService.getBaseMapper().delete(bomNewPbomChildService.lambdaQuery() + bomNewPbomChildService.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewPbomChildEntity.class) .eq(BomNewPbomChildEntity::getParentRowId, pp.getRowId())); } } From 3ed9941da1e5c062959342d35f005e1206e53cf7 Mon Sep 17 00:00:00 2001 From: jing's Date: Thu, 15 Aug 2024 17:32:15 +0800 Subject: [PATCH 09/15] =?UTF-8?q?excel=20=E5=AF=BC=E5=85=A5=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=B4=9F=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/service/EBomImportService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java index 6ad44434..8d923d12 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java @@ -308,8 +308,8 @@ public class EBomImportService { .collect(Collectors.toList()) ); } - - numError = datas.stream().filter(u -> Objects.isNull(u.getNum()) || BigDecimal.ZERO.compareTo(u.getNum()) >= 0) + //2024.8.15 BigDecimal.ZERO.compareTo(u.getNum()) >= 0 取消负数限制 + numError = datas.stream().filter(u -> Objects.isNull(u.getNum())) .map(BaseImportExcelDTO::getRowNum) .collect(Collectors.toList()); From 26da8f93be85271e61bf6206a6c78215d4933e61 Mon Sep 17 00:00:00 2001 From: jing's Date: Thu, 15 Aug 2024 17:34:45 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B4=9F=E6=95=B0?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/service/EBomImportService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java index 8d923d12..86fbbaed 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java @@ -308,13 +308,13 @@ public class EBomImportService { .collect(Collectors.toList()) ); } - //2024.8.15 BigDecimal.ZERO.compareTo(u.getNum()) >= 0 取消负数限制 - numError = datas.stream().filter(u -> Objects.isNull(u.getNum())) + + numError = datas.stream().filter(u -> Objects.isNull(u.getNum()) || BigDecimal.ZERO.compareTo(u.getNum()) == 0) .map(BaseImportExcelDTO::getRowNum) .collect(Collectors.toList()); if (!numError.isEmpty()) { - errorMsg.addAll(numError.stream().map(n -> OperationErrorMsgVO.create("第" + n + "行", "数量不正确")) + errorMsg.addAll(numError.stream().map(n -> OperationErrorMsgVO.create("第" + n + "行", "数量不正确(不能为空或0)")) .collect(Collectors.toList()) ); } From a5095fe55a166ecff7813aef8ad4dc2833a83e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 15 Aug 2024 22:10:42 +0800 Subject: [PATCH 11/15] =?UTF-8?q?F=E6=8F=90=E5=B1=82=E5=90=8E=E9=80=A0?= =?UTF-8?q?=E6=88=90=E7=9A=84=E7=A9=BA=E5=8C=85=E8=A6=81=E9=80=92=E5=BD=92?= =?UTF-8?q?=E5=BE=80=E4=B8=8A=E6=A3=80=E6=9F=A5=E5=88=A0=E9=99=A42-?= =?UTF-8?q?=E5=85=88=E4=B8=8D=E5=8F=91=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/domain/EBom/EBomToPbomBase.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index edc84e7e..74dc3531 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -739,20 +739,23 @@ public abstract class EBomToPbomBase { else { addEBomNew.add(parentBom.getBomRowId()); } - - //如子级都为F 项父级也不转 - Set projectSet = newParentChild.stream().map(u -> u.getProjectType().toUpperCase()).collect(Collectors.toSet()); - if (CollUtil.isNotEmpty(projectSet)) { - if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && - (ImmutableSet.of("F").equals(projectSet) || ImmutableSet.of("F", "Z").equals(projectSet) || ImmutableSet.of("Z").equals(projectSet))) { - parentBom.setNoConvertToPBomIs(1); - parentBom.setNotToPBomForFZ(BomConstant.YES); - childDelMaterialNos.add(parentBom.getMaterialNo()); - } + } + //如子级都为F 项父级也不转 + Set projectSet = newParentChild.stream().map(u -> u.getProjectType().toUpperCase()).collect(Collectors.toSet()); + if (CollUtil.isNotEmpty(projectSet)) { + if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && + (ImmutableSet.of("F").equals(projectSet) || ImmutableSet.of("F", "Z").equals(projectSet) || ImmutableSet.of("Z").equals(projectSet))) { + parentBom.setNoConvertToPBomIs(1); + parentBom.setNotToPBomForFZ(BomConstant.YES); + childDelMaterialNos.add(parentBom.getMaterialNo()); } } } + List FzItem = allBomDetail.stream().filter(u -> StrUtil.isNotBlank(u.getProjectType()) && ImmutableList.of("F", "Z").contains(u.getProjectType())).collect(Collectors.toList()); + FzItem.forEach(u->{ + u.setNotToPBomForFZ(BomConstant.YES); + }); //递归 F，Z项所有父级 handlerFZEmptyBom(); @@ -764,9 +767,11 @@ public abstract class EBomToPbomBase { List parentBoms = getParentForAllSubNodeIsNotToPBomForFZ(); while (CollUtil.isNotEmpty(parentBoms)){ parentBoms.forEach(u->{ - u.setNoConvertToPBomIs(1); - u.setNotToPBomForFZ(BomConstant.YES); - childDelMaterialNos.add(u.getMaterialNo()); + if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(u.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(u.getVirtualPartType())) { + u.setNoConvertToPBomIs(1); + u.setNotToPBomForFZ(BomConstant.YES); + childDelMaterialNos.add(u.getMaterialNo()); + } }); parentBoms = getParentForAllSubNodeIsNotToPBomForFZ(); } @@ -811,6 +816,10 @@ public abstract class EBomToPbomBase { } + List FzItem = allBomDetail.stream().filter(u -> StrUtil.isNotBlank(u.getProjectType()) && ImmutableList.of("F", "Z").contains(u.getProjectType())).collect(Collectors.toList()); + FzItem.forEach(u->{ + u.setNotToPBomForFZ(BomConstant.YES); + }); //递归 F，Z项所有父级 handlerFZEmptyBom(); From c6d9b3e0319f61a1273f3c2fa1adec61aa44a994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 16 Aug 2024 16:48:18 +0800 Subject: [PATCH 12/15] =?UTF-8?q?optimize:=20=E5=AF=BC=E5=85=A5SAP?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=85=88=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89?= =?UTF-8?q?bom=EF=BC=8C=E7=84=B6=E5=90=8E=E5=B0=86=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E6=98=AFSAP=E7=9A=84bom=E4=B8=A2=E5=BC=83=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=AF=BC=E5=85=A5=E5=88=B0SAP=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomExportToSAP.java | 10 +++++----- .../bomnew/service/BomNewPbomExportToSAPImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java index efae505e..7be6dd49 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java @@ -112,7 +112,7 @@ public class BomNewEbomExportToSAP { private void handlerItem(BomNewEbomChildEntity it, BomNewEbomParentEntity p) { LOGGER.debug("{} 添加物料 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), p.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc()); - addToT1(convert(it, p.getMaterialNo(), Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue()))); + addToT1(convert(it, p, Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue()))); BomNewEbomParentEntity cp = getParent(it); if (Objects.nonNull(cp)) { buildChildrenForSap(cp); @@ -142,16 +142,16 @@ public class BomNewEbomExportToSAP { } } - private T1ExtDTO convert(BomNewEbomChildEntity child, String parentMaterialNo, boolean isZFB) { + private T1ExtDTO convert(BomNewEbomChildEntity child, BomNewEbomParentEntity p, boolean isZFB) { T1ExtDTO t = new T1ExtDTO(); t.setID(RandomUtil.randomNumbers(5)); - t.setMATNR(parentMaterialNo); + t.setMATNR(p.getMaterialNo()); t.setMENGE(child.getNum().toString()); t.setPOSTP(child.getProjectType()); t.setDATUM(dateYMD); t.setMEINS(child.getMaterialUnit()); t.setIDNRK(child.getMaterialNo()); - t.setIgnore(false); + t.setIgnore(Objects.equals(p.getSource(), EBomSourceEnum.FROM_SAP.getValue())); t.setZFB(isZFB); if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(child.getProjectType())) { t.setIDNRK(""); @@ -168,7 +168,7 @@ public class BomNewEbomExportToSAP { .eq(BomNewEbomParentEntity::getMaterialNo, c.getMaterialNo()) .eq(BomNewEbomParentEntity::getUserRootIs, 0) .eq(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()) - .ne(BomNewEbomParentEntity::getSource, EBomSourceEnum.FROM_SAP.getValue()) + // .ne(BomNewEbomParentEntity::getSource, EBomSourceEnum.FROM_SAP.getValue()) .orderByDesc(BomNewEbomParentEntity::getCurrentVersion) .last(" limit 1") .one(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index 22612ba2..7a3e5475 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -195,7 +195,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { t.setIDNRK(child.getMaterialNo()); t.setZSORT(BomUtil.generateSapOrderNum(child.getProjectType(), child.getMaterialCategoryCode() , child.getFacCode(), child.getMaterialNo(), Objects.isNull(parent) ? 0 : parent.getBomExist())); - t.setIgnore(ignore); + t.setIgnore(ignore || Objects.equals(parent.getSource(), PbomSourceEnum.FROM_SAP.getValue())); if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(child.getProjectType())) { t.setIDNRK(""); t.setPOTX1(child.getMaterialDesc()); @@ -282,7 +282,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { .eq(BomNewPbomParentEntity::getMaterialNo, child.getMaterialNo()) .ge(BomNewPbomParentEntity::getStatus, PBomStatusEnum.PUBLISH.getValue()) .eq(BomNewPbomParentEntity::getFacCode, child.getFacCode()) - .ne(BomNewPbomParentEntity::getSource, PbomSourceEnum.FROM_SAP.getValue()) + // .ne(BomNewPbomParentEntity::getSource, PbomSourceEnum.FROM_SAP.getValue()) .orderByDesc(BomNewPbomParentEntity::getCurrentVersion) .last(" limit 1") .one(); From 2c7db34d4abd4079b40417a7e29db8860f29b619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 16 Aug 2024 17:24:45 +0800 Subject: [PATCH 13/15] =?UTF-8?q?optimize:=20=E5=AF=BC=E5=85=A5SAP?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=85=88=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89?= =?UTF-8?q?bom=EF=BC=8C=E7=84=B6=E5=90=8E=E5=B0=86=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E6=98=AFSAP=E7=9A=84bom=E4=B8=A2=E5=BC=83=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=AF=BC=E5=85=A5=E5=88=B0SAP=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewEbomExportToSAP.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java index 7be6dd49..9223ed8e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java @@ -164,9 +164,10 @@ public class BomNewEbomExportToSAP { private BomNewEbomParentEntity getParent(BomNewEbomChildEntity c) { BomNewEbomParentEntity p = bomNewEbomParentService.lambdaQuery() .select(BomNewEbomParentEntity::getRowId, BomNewEbomParentEntity::getMaterialNo - , BomNewEbomParentEntity::getMaterialDesc, BomNewEbomParentEntity::getUserRootIs) + , BomNewEbomParentEntity::getMaterialDesc, BomNewEbomParentEntity::getUserRootIs + , BomNewEbomParentEntity::getSource) .eq(BomNewEbomParentEntity::getMaterialNo, c.getMaterialNo()) - .eq(BomNewEbomParentEntity::getUserRootIs, 0) + // .eq(BomNewEbomParentEntity::getUserRootIs, 0) .eq(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()) // .ne(BomNewEbomParentEntity::getSource, EBomSourceEnum.FROM_SAP.getValue()) .orderByDesc(BomNewEbomParentEntity::getCurrentVersion) From c6589d9bf19fa75fbc2982cf5569442be254e153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 18 Aug 2024 15:55:00 +0800 Subject: [PATCH 14/15] =?UTF-8?q?fix(pbom):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=85=A5SAP=E6=97=B6=E4=BD=BF=E7=94=A8=E7=9A=84=E7=88=B6?= =?UTF-8?q?=E7=BA=A7=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/BomNewPbomExportToSAPImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index 7a3e5475..06826265 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -87,7 +87,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { } for (BomNewPbomChildEntity it : rcs) { BomNewPbomParentEntity cp = getParent(it); - addToT1(convert(cp, it, root.getMaterialNo(), false)); + addToT1(convert(cp, it, root, false)); if (Objects.nonNull(cp)) { if (!is31) { buildChildrenForSap(ddpRowId, cp, it, false); @@ -180,14 +180,14 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { * 转换为sap的t1 * @param parent 该节点对应的parent * @param child 该节点对应的child - * @param parentMaterialNo 父级物料编号 + * @param p 父级节点parent * @param ignore 导入时是否忽略 * @return */ - private T1ExtDTO convert(BomNewPbomParentEntity parent, BomNewPbomChildEntity child, String parentMaterialNo, Boolean ignore) { + private T1ExtDTO convert(BomNewPbomParentEntity parent, BomNewPbomChildEntity child, BomNewPbomParentEntity p, Boolean ignore) { T1ExtDTO t = new T1ExtDTO(); t.setID(RandomUtil.randomNumbers(5)); - t.setMATNR(parentMaterialNo); + t.setMATNR(p.getMaterialNo()); t.setMENGE(child.getNum().toString()); t.setPOSTP(child.getProjectType()); t.setDATUM(dateYMD); @@ -195,7 +195,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { t.setIDNRK(child.getMaterialNo()); t.setZSORT(BomUtil.generateSapOrderNum(child.getProjectType(), child.getMaterialCategoryCode() , child.getFacCode(), child.getMaterialNo(), Objects.isNull(parent) ? 0 : parent.getBomExist())); - t.setIgnore(ignore || Objects.equals(parent.getSource(), PbomSourceEnum.FROM_SAP.getValue())); + t.setIgnore(ignore || Objects.equals(p.getSource(), PbomSourceEnum.FROM_SAP.getValue())); if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(child.getProjectType())) { t.setIDNRK(""); t.setPOTX1(child.getMaterialDesc()); @@ -236,7 +236,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { .orElse(null); if (Objects.isNull(cct)) { LOGGER.debug("{} 物料提层到顶级发货包 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), p.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc()); - cct = convert(cp, it, p.getMaterialNo(), false); + cct = convert(cp, it, p, false); cmap.get(cRowId).add(cct); addToT1(cct); } else { @@ -248,7 +248,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { // } else if (!Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())) { } else { LOGGER.debug("{} 添加物料 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), p.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc()); - addToT1(convert(cp, it, p.getMaterialNo(), ignore)); + addToT1(convert(cp, it, p, ignore)); } if (Objects.nonNull(cp)) { if (!ignore && cp.getUserRootIs() == 1) { From 8640baa6270b2bed4105698e5213c26870841d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Sun, 18 Aug 2024 17:35:53 +0800 Subject: [PATCH 15/15] =?UTF-8?q?PBOM=E5=B7=A5=E4=BD=9C=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A21020=E6=95=B0=E6=8D=AE=E6=97=B6=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=8F=AA=E8=83=BD=E6=9F=A5=E6=9C=AC=E4=BA=BA=E7=9A=84?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewPbomParentService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index b1715cb8..47b97f22 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -165,7 +165,10 @@ public class BomNewPbomParentService extends ServiceImpl(); } else { String queryFac= StrUtil.isBlank(query.getFacCode())? userRoleService.getUserFactory():query.getFacCode(); - + //查1020 时不限制只能查本人的 + if(StrUtil.isNotBlank(query.getFacCode()) && EBomConstant.XIAN_TAO_FACTORY_CODE_1020.equals(query.getFacCode()) ){ + query.setShowMySelfOnly(0); + } Page result = this.getBaseMapper().workDetailsListByPage(new Page<>(query.getPage() , query.getPageSize()), query, queryFac, SessionUtil.getDepartRowId(), SessionUtil.getUserCode()); materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);