From 8719140089c4e845f6fabe88b1df140a5ce84377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 4 Jun 2024 17:33:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(ebom):=20=E5=B7=A5=E4=BD=9C=E8=A1=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E5=8F=AA=E6=90=9C=E7=B4=A2=E8=8D=89?= =?UTF-8?q?=E7=A8=BF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/mapper/master/BomNewEbomParentMapper.java | 2 +- .../product/bomnew/service/BomNewEbomParentService.java | 2 +- .../main/resources/mapper/master/BomNewEbomParentMapper.xml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index 77cf2477..e2991942 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -86,7 +86,7 @@ public interface BomNewEbomParentMapper extends BaseMapper getChildren(Long bomRowId, int type); - List getBom(String materialNo, String drawingNo); + List getBom(Integer state, String materialNo, String drawingNo); List getVOById(Long parentRowId); 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 29355798..d3aeb713 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 @@ -2241,7 +2241,7 @@ public class BomNewEbomParentService extends ServiceImpl boms = this.getBaseMapper().getBom(query.getMaterialNo(), query.getDrawingNo()); + List boms = this.getBaseMapper().getBom(0, query.getMaterialNo(), query.getDrawingNo()); boms.removeIf(c -> Objects.equals(c.getLastVersionIs(), 0) || Objects.equals(c.getStatus(), EBomStatusEnum.PUBLISHED.getValue())); boms.forEach(this::buildChildren); roots.addAll(boms.stream().filter(b -> b.getRootIs() == 0 && b.getUserRootIs() == 0 && b.getRootIsForWaitReview() == 0).map(this::buildParent).flatMap(List::stream).collect(Collectors.toList())); 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 cd42cfff..c46a8458 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 @@ -464,6 +464,12 @@ AND b.drawing_no = #{drawingNo} + + AND a.status < 4 + + + AND a.status = 4 + ORDER BY b.order_number From 16ddc6855b39c10366f77840e41434636777a7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 5 Jun 2024 08:50:25 +0800 Subject: [PATCH 2/2] =?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 { - 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 @@ - 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 #{item} - + ; + UPDATE t_bom_new_ebom_child SET edit_status=2 WHERE parent_row_id IN + + #{item} + ;