From 91a2e06147e94a31083816b7afea27f598987d90 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 15 Jan 2024 23:34:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewMbomParentService.java      |  6 +++++
 .../service/OptionalMbomMaterialService.java  | 24 ++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
index 061e446d..d9d0fc62 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nflg.product.bomnew.constant.EBomConstant;
 import com.nflg.product.bomnew.constant.MBomConstantEnum;
 import com.nflg.product.bomnew.mapper.master.BomNewMbomParentMapper;
 import com.nflg.product.bomnew.pojo.dto.BomNewMBomChildDTO;
@@ -71,6 +72,9 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
                     page.getRecords().add(parent);
                 }
 
+
+                SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(page.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
+
                 return page;
             }
         }
@@ -79,6 +83,7 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
         //不是通过物料或图号搜索
         page = this.getBaseMapper().getMBomListPage(new Page<>(query.getPage(), query.getPageSize()), query);
 
+        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(page.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
 
 
         return page;
@@ -113,6 +118,7 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
             });
         }
 
+        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(listChild, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
 
         return listChild;
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
index 8c31c151..9bd569db 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
@@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -158,7 +159,8 @@ public class OptionalMbomMaterialService extends ServiceImpl<OptionalMbomMateria
             }
 
         } else if (StringUtils.isNotEmpty(query.getDrawingNo())) {
-            materialMainList = materialMainService.lambdaQuery().eq(MaterialMainEntity::getDrawingNo, query.getDrawingNo()).list();
+            materialMainList = materialMainService.lambdaQuery().likeRight(MaterialMainEntity::getDrawingNo, query.getDrawingNo()).list();
+
             if (CollUtil.isEmpty(materialMainList)) {
                 throw new NflgBusinessException(STATE.Error, StrUtil.format("{} 图号的物料信息不存在", query.getDrawingNo()));
             }
@@ -224,12 +226,28 @@ public class OptionalMbomMaterialService extends ServiceImpl<OptionalMbomMateria
         if(parentRow==null){
             throw new NflgBusinessException(STATE.Error,"添加的数据未查询到父节点");
         }
-            List<OptionalMbomMaterialEntity> entityList=Convert.convert(new TypeReference<List<OptionalMbomMaterialEntity>>(){
+
+        Map<String,List<OptionalMbomMaterialListVO>> frequencyMap= dto.getDatas().stream().collect(Collectors.groupingBy(OptionalMbomMaterialListVO::getMaterialNo));
+
+        frequencyMap.forEach((key,value)->{
+            List<OptionalMbomMaterialListVO> list= frequencyMap.get(key);
+            if(list.size()>1){
+                throw new NflgBusinessException(STATE.Error,StrUtil.format("{} 物料编码重复",key));
+            }
+        });
+
+
+
+
+        List<OptionalMbomMaterialEntity> entityList=Convert.convert(new TypeReference<List<OptionalMbomMaterialEntity>>(){
 
         },dto.getDatas());
 
 
-        entityList.forEach(item->{
+        List<OptionalMbomMaterialEntity> entityList2=entityList.stream().filter(item -> (Objects.nonNull(item.getRowId()) && item.getRowId() > 0)).collect(Collectors.toList());
+
+
+        entityList2.forEach(item->{
             item.setParentRowId(dto.getRowId());
             item.setRootRowId(parentRow.getRootRowId());
             item.setCreatedTime(DateUtil.now());

From 8799ac54c2c99cff108b4dad7ce20b33992cd5a5 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Tue, 16 Jan 2024 08:13:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/OptionalMbomMaterialService.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
index 9bd569db..6f1026b8 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
@@ -244,13 +244,13 @@ public class OptionalMbomMaterialService extends ServiceImpl<OptionalMbomMateria
         },dto.getDatas());
 
 
-        List<OptionalMbomMaterialEntity> entityList2=entityList.stream().filter(item -> (Objects.nonNull(item.getRowId()) && item.getRowId() > 0)).collect(Collectors.toList());
-
-
-        entityList2.forEach(item->{
+        entityList.forEach(item->{
             item.setParentRowId(dto.getRowId());
             item.setRootRowId(parentRow.getRootRowId());
-            item.setCreatedTime(DateUtil.now());
+            if(Objects.isNull(item.getRowId()) || item.getRowId().longValue() == 0){
+                item.setCreatedTime(DateUtil.now());
+            }
+
             item.setCreatedBy(SessionUtil.getUserCode());
             item .setRealName(SessionUtil.getRealName());
             item .setDeptName(SessionUtil.getDepartName());