From 16ddc6855b39c10366f77840e41434636777a7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 5 Jun 2024 08:50:25 +0800
Subject: [PATCH] =?UTF-8?q?optimize(ebom):=20=E8=BD=ACpbom=E6=97=B6?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=B2=E5=A4=84=E7=90=86=EF=BC=8C=E5=90=8C=E6=97=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=8B=E7=BA=A7=E8=8A=82=E7=82=B9=E7=9A=84child?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B7=B2=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java  | 5 -----
 .../resources/mapper/master/BomNewEbomParentMapper.xml   | 9 +++++++--
 2 files changed, 7 insertions(+), 7 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 d3aeb713..0724a9c3 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
@@ -51,7 +51,6 @@ import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -946,10 +945,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             }
 
             SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId);
-
-            CompletableFuture.runAsync(() -> {
-                importToSAP(bomRowId);
-            });
         }
     }
 
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 c46a8458..18b0d035 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
@@ -309,10 +309,15 @@
     </delete>
 
     <update id="updateStateBatchByRowIds">
-        update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now() where row_id in
+        update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now(),edit_status=2,exception_status=1
+        where row_id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
-        </foreach>
+        </foreach>;
+        UPDATE t_bom_new_ebom_child SET edit_status=2 WHERE parent_row_id IN
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>;
     </update>