From 26108a818333587cffda3ed0ddaa39fb73e90218 Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 10 May 2024 11:50:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=98=AF=E5=90=A6=E5=9C=A8=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E5=AD=98=E5=9C=A8=20=E6=9A=82=E5=AD=98?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E6=A3=80=E6=9F=A5=EF=BC=8C=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/domain/EBom/EBomEdit.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java index 4c8bea6d..1e2d470c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java @@ -255,11 +255,13 @@ public class EBomEdit { } materialNos.add(dto.getParent().getMaterialNo()); //检查物料编码是否在主数据中存在 - List materialBaseInfo = SpringUtil.getBean(MaterialMainService.class).getMaterialBaseInfo(materialNos); - List effectiveMaterialNos = materialBaseInfo.stream().map(u -> u.getMaterialNo()).collect(Collectors.toList()); - Set difference = Sets.difference(new HashSet<>(materialNos), new HashSet<>(effectiveMaterialNos)); - VUtils.isTure(CollUtil.isNotEmpty(difference)).throwMessage(StrUtil.join(",", difference) + "在物料主数据中不存在"); - + //暂存不需检查，提交时检查 + if(ObjectUtil.equal(EbomEditStatusEnum.HANDLER_FINISHED.getValue(),dto.getOpType())) { + List materialBaseInfo = SpringUtil.getBean(MaterialMainService.class).getMaterialBaseInfo(materialNos); + List effectiveMaterialNos = materialBaseInfo.stream().map(u -> u.getMaterialNo()).collect(Collectors.toList()); + Set difference = Sets.difference(new HashSet<>(materialNos), new HashSet<>(effectiveMaterialNos)); + VUtils.isTure(CollUtil.isNotEmpty(difference)).throwMessage(StrUtil.join(",", difference) + "在物料主数据中不存在"); + } //检查数据是否可修改 List notNullRowIdList= dto.getDatas().stream().filter(u->u.getRowId()!=null && u.getRowId()>0).collect(Collectors.toList()); From 8dc7503f39965b5628e0a57072650e47b8955757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 10 May 2024 16:29:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(ebom):=20=E7=BC=96=E8=BE=91=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9A=90=E8=97=8F=E8=99=9A=E6=8B=9F=E5=8C=85?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/EbomApi.java | 6 +++--- .../service/BomNewEbomParentService.java | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) 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 00b5f29e..323a7164 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 @@ -289,10 +289,10 @@ public class EbomApi extends BaseApi { return ResultVO.success(true); } - @GetMapping("editDetail") @ApiOperation("编辑物料列表") - public ResultVO editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId, @RequestParam("projectType") String projectType) { + public ResultVO editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId + , @RequestParam("projectType") String projectType, @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage) { if (Objects.isNull(rowId)) { VUtils.isTure(true).throwMessage("rowId 不能为空"); } @@ -300,7 +300,7 @@ public class EbomApi extends BaseApi { VUtils.isTure(true).throwMessage("bomRowId不能为空"); } - return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType)); + return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage)); } @PostMapping("updateProjectType") 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 47ce7262..61332f08 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 @@ -1543,11 +1543,11 @@ public class BomNewEbomParentService extends ServiceImpl1.存在下级物料或是缺BOM
2.物料的分类20且流程类型为外协和采购部分
3.分类70中的7013时的物料 "); } vo.setDatas(new ArrayList<>()); } else { @@ -1572,7 +1571,17 @@ public class BomNewEbomParentService extends ServiceImpl childList = getChild(bomRowId); + if (hideVirtualPackage == 1) { + List virtualPackageList = childList.stream() + .filter(c -> c.getVirtualPackageIs() == 1 && c.getBomRowId() > 0) + .collect(Collectors.toList()); + virtualPackageList.forEach(v -> { + childList.remove(v); + childList.addAll(getChild(v.getBomRowId())); + }); + } + vo.setDatas(childList); } From da8e40c8bd37994664ea29e2b48800318b93e315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 10 May 2024 17:30:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(dqbom):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/mapper/master/BomNewDQbomParentMapper.java | 2 +- .../java/com/nflg/product/bomnew/service/DQBomService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewDQbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewDQbomParentMapper.java index 777f1439..f6c72489 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewDQbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewDQbomParentMapper.java @@ -22,7 +22,7 @@ public interface BomNewDQbomParentMapper extends BaseMapper getChildren(Long bomRowId); + // List getChildren(Long bomRowId); List getBom(int status, String materialNo, String drawingNo, String materialName); 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 3c0d20cd..5b917b99 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 @@ -375,7 +375,8 @@ public class DQBomService { private void getChildren(List datas, BomNewDQbomVO parent) { if (Objects.isNull(parent) || parent.getBomRowId() == 0) return; - List cc = dQBomParentService.getBaseMapper().getChildren(parent.getBomRowId()); + //List cc = dQBomParentService.getBaseMapper().getChildren(parent.getBomRowId()); + List cc = getChild(parent.getBomRowId()); if (CollUtil.isNotEmpty(cc)) { cc.forEach(c -> { c.setParentMaterialNo(parent.getMaterialNo());