From 6e3e65e453878460c4c850b191db6f6eb261cfd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 30 Mar 2024 10:16:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=8Ecad=E5=AF=BC=E5=85=A5=E5=8E=9F?= =?UTF-8?q?=E5=A7=8Bbom=E6=97=B6=E5=B0=86=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E4=B8=BA=E2=80=9C=E6=97=A0=E2=80=9D=E7=9A=84=E9=A1=B9?= =?UTF-8?q?=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/api/user/OriginalBomApi.java | 4 ++-- .../bomnew/service/BomNewOriginalParentService.java | 6 +++--- .../domain/OriginalBom/PlmBomToOriginalConvert.java | 8 +++++++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java index 35887dcf..674aecec 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java @@ -114,9 +114,9 @@ public class OriginalBomApi extends BaseApi { @Transactional(rollbackFor = Exception.class) @LogRecord(success = "从cad获取bom到原始BOM,操作结果:{{#_ret}}", bizNo = "" ,type = "从CAD获取BOM数据") - public ResultVO> pullFromPlm() { + public ResultVO> pullFromCad() { - List result = originalParentService.pullFromPlm(SessionUtil.getUserCode()); + List result = originalParentService.pullFromCad(SessionUtil.getUserCode()); originalParentService.computeLevelNumAndRootState(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index 7ba75293..4775a037 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java @@ -402,7 +402,7 @@ public class BomNewOriginalParentService extends ServiceImpl pullFromPlm(String userCode) { + public List pullFromCad(String userCode) { List parents = originalCadParentService.lambdaQuery().eq(BomOriginalCadParentEntity::getStatus, 1).eq(BomOriginalCadParentEntity::getCreatedBy, userCode).list(); VUtils.isTure(CollUtil.isEmpty(parents)).throwMessage("没有你的数据，你无需转换"); @@ -420,8 +420,8 @@ public class BomNewOriginalParentService extends ServiceImpl delRowIds = parents.stream().map(u -> u.getRowId()).collect(Collectors.toList()); + //删除cad临时表数据 + List delRowIds = parents.stream().map(BomOriginalCadParentEntity::getRowId).collect(Collectors.toList()); if (CollUtil.isNotEmpty(delRowIds)) { originalCadParentService.getBaseMapper().deleteBatchIds(delRowIds); originalCadParentService.getBaseMapper().delChildByParentRowIds(delRowIds); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java index 1e641f15..23118d43 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java @@ -47,9 +47,15 @@ public class PlmBomToOriginalConvert extends BaseConvert { childs = Convert.toList(BomOriginalPlmBomVO.class, SpringUtil.getBean(BomOriginalCadChildService.class).lambdaQuery().eq(BomOriginalCadChildEntity::getParentRowId, inParent.getRowId()).list()); parent = Convert.convert(BomOriginalPlmBomVO.class, inParent); //图号-初始化缺编码的物料 - if(StrUtil.isBlank(parent.getMaterialNo()) || parent.getMaterialNo().trim().equalsIgnoreCase("无")){ + if(parent.getMaterialNo().trim().equalsIgnoreCase("无")){ + parent.setMaterialNo(""); + } + if(StrUtil.isBlank(parent.getMaterialNo())){ SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(ImmutableList.of(parent) ,BomOriginalPlmBomVO::getDrawingNo,BomOriginalPlmBomVO::setMaterialNo,BomOriginalPlmBomVO::setMaterialName); } + childs.stream().filter(f->f.getMaterialNo().trim().equalsIgnoreCase("无")).forEach(it->{ + it.setMaterialNo(""); + }); List noMaterialNoList = childs.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList()); if(CollUtil.isNotEmpty(noMaterialNoList)){ SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(noMaterialNoList ,BomOriginalPlmBomVO::getDrawingNo,BomOriginalPlmBomVO::setMaterialNo,BomOriginalPlmBomVO::setMaterialName);