From defc69ab6544dd14f60cc66c66bc901436bfa05e Mon Sep 17 00:00:00 2001 From: jing's Date: Wed, 11 Sep 2024 09:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8E=BB=E6=8E=89=E5=89=8D=E5=90=8E=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/EBomEdit.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 cc17f729..64569519 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 @@ -172,7 +172,9 @@ public class EBomEdit { child.setEditStatus(dto.getOpType()); child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum())); child.setModifyTime(LocalDateTime.now()); - + if (StrUtil.isNotEmpty(child.getProjectType())) { + child.setProjectType(child.getProjectType().toUpperCase().trim()); + } // if (child.getMaterialName().contains(VirtualPackageTypeEnum.MAKING_PACKAGE.getConMaterialName())) { // child.setVirtualPartType(VirtualPackageTypeEnum.MAKING_PACKAGE.getValue()); // child.setVirtualPartIs(1); @@ -202,14 +204,13 @@ public class EBomEdit { child.setOrderNumber("001"); } if (dto.getOpType() == EbomEditStatusEnum.HANDLER_FINISHED.getValue()) { - child.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); - // parent.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); + if(ObjectUtil.isNull(child.getExceptionStatus())) { + child.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); + } checkExcept(dto.getParent(), child); } - if (StrUtil.isNotBlank(child.getProjectType())) { - child.setProjectType(child.getProjectType().toUpperCase()); - } + if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, child.getProjectType(), true)) { String id = RandomUtil.randomNumbers(9); child.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id);