From 123345a0f3af88c96d409f9773a86f1b8236d108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 3 Jun 2024 16:45:50 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8DeBOM=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=90=8E2=E6=AC=A1=E8=BD=ACPBOM=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/master/BomNewEbomParentMapper.xml         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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 68c9bc56..7056b7e1 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
@@ -501,9 +501,14 @@
         INSERT INTO  `t_bom_new_ebom_parent_formal` (`row_id`, `batch_no`, `drawing_no`, `material_no`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `material_original_unit`, `unit_weight`, `total_weight`, `current_version`, `num`, `source`, `root_is`, `should_bom_exist`, `super_material_status`, `bom_exist`, `last_version_is`, `edit_status`, `status`, `user_root_is`, `virtrual_package_enum`, `exception_status`, `virtual_package_is`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `created_job`, `audit_time`, `audit_user_name`, `release_time`, `release_user_name`, `revert_time`, `revert_user_name`, `expire_end_time`, `convert_to_ebom_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `modify_time`, `sap_state`, `sap_time`)
         select `row_id`, `batch_no`, `drawing_no`, `material_no`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `material_original_unit`, `unit_weight`, `total_weight`, `current_version`, `num`, `source`, `root_is`, `should_bom_exist`, `super_material_status`, `bom_exist`, `last_version_is`, `edit_status`, `status`, `user_root_is`, `virtrual_package_enum`, `exception_status`, `virtual_package_is`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `created_job`, `audit_time`, `audit_user_name`, `release_time`, `release_user_name`, `revert_time`, `revert_user_name`, `expire_end_time`, `convert_to_ebom_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `modify_time`, `sap_state`, `sap_time` from t_bom_new_ebom_parent
         where row_id in
+        <foreach collection="parentRowIds" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>  and row_id not in (
+         select row_id from  t_bom_new_ebom_parent_formal  where row_id in
         <foreach collection="parentRowIds" item="item" index="index" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        )
     </insert>
 
     <insert id="insertEBomFormalChild">
@@ -513,7 +518,12 @@
         where parent_row_id in
             <foreach collection="parentRowIds" item="parentRowId" open="(" separator="," close=")">
                 #{parentRowId}
-            </foreach>
+            </foreach>  and  row_id not in (
+            select row_id from  t_bom_new_ebom_parent_formal  where row_id in
+            <foreach collection="parentRowIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+             </foreach>
+        )
     </insert>
 
     <delete id="delEBomHistory">