From 79740360fab1cd250eb1b697d44dc3c6fd6b8015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 2 Sep 2024 14:28:46 +0800 Subject: [PATCH] =?UTF-8?q?EBOM-=E7=BC=96=E8=BE=91-=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=A9=E6=96=99=E8=A1=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 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 57cafc16..b5ffbb47 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 @@ -2341,13 +2341,11 @@ public class BomNewEbomParentService extends ServiceImpl changeMaterial(BomNewEBomChangeDTO dto) { List materialVOS = CheckEBomException.checkMaterialNoInMain(dto.getDatas()); - SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(dto.getDatas(), materialVOS, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2); - - for (BomNewEbomParentVO vo : - dto.getDatas()) { + String[] editEditIgnoredFields = {"material", "materialTexture", "projectType", "materialNo", "materialName","materialDesc","drawingNo"}; + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(dto.getDatas(), materialVOS, editEditIgnoredFields); + for (BomNewEbomParentVO vo : dto.getDatas()) { vo.setTotalWeight(NumberUtil.mul(vo.getUnitWeight(), vo.getNum())); } - return dto.getDatas(); }