From 1de556b5ad175beac0ed14c72697b3729ea1fdc0 Mon Sep 17 00:00:00 2001
From: "BF-202309241046\\Administrator" <tan_jing_song@126.com>
Date: Thu, 4 Jul 2024 13:07:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 19 +++++++++++++++++++
 .../mapper/master/BomNewEbomParentMapper.xml  |  4 ++--
 2 files changed, 21 insertions(+), 2 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 bb7caa08..ae7d2367 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
@@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j;
 import nflg.product.common.constant.STATE;
 import nflg.product.common.vo.ResultVO;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -107,6 +108,24 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
     @Resource
     private BomNewSapErrorMsgService bomNewSapErrorMsgService;
 
+
+
+    public List<BomNewEbomParentVO> getParentChild(  Long rowId) {
+
+        return  this.getBaseMapper().getParentChild(rowId);
+    }
+
+    public  List<BomNewEbomParentVO> getParentChildBatch(  List<Long> rowIds) {
+
+        return  this.getBaseMapper().getParentChildBatch(rowIds);
+    }
+
+
+
+
+
+
+
     /**
      * 获取列表
      *
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 7ed5623c..62b91408 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -223,14 +223,14 @@
 
     <!--获取子级-->
     <select id="getParentChild" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
-        select *
+        select *,bom_version_row_id as bom_row_id
         from t_bom_new_ebom_child
         where parent_row_id = #{rowId}
         order by order_number
     </select>
 
     <select id="getParentChildBatch" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
-        select *
+        select *,bom_version_row_id as bom_row_id
         from t_bom_new_ebom_child
         where parent_row_id in
         <foreach collection="rowIds" item="rowId" open="(" separator="," close=")">