From 82e0749c5774a5b1519014472a81efa638d5ecf2 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Fri, 19 Jan 2024 20:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 19 ++++++++++++++++++-
 1 file changed, 18 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 04936285..b1b26f41 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
@@ -1233,11 +1233,28 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
             baseMaterialVO.setCreatedTime(LocalDateTime.now());
             baseMaterialVO.setModifyTime(LocalDateTime.now());
-            baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
+            if(StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) {
+                baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
+            }
             if(bomParent!=null){
                 baseMaterialVO.setEditStatus(bomParent.getEditStatus());
                 baseMaterialVO.setStatus(bomParent.getStatus());
             }
+
+
+            if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo())
+                    && (MaterialGetEnum.MaterialStateEnum.STATE_NO_4.equalsValue(baseMaterialVO.getMaterialState())
+                    || MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(baseMaterialVO.getMaterialState()))) {
+                baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
+            }
+//            else if (StrUtil.isBlank(baseMaterialVO.getMaterialNo()) || Objects.isNull(baseMaterialVO.getNum()) || BigDecimal.ZERO.compareTo(baseMaterialVO.getNum()) >= 0) {
+//                baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue());
+//            }
+
+            else if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo()) && Objects.isNull(baseMaterialVO.getMaterialState())) {
+                baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue());
+            }
+
             baseMaterialVO.setTotalWeight(NumberUtil.mul(baseMaterialVO.getUnitWeight(), baseMaterialVO.getNum()));
             return baseMaterialVO;
         }