From ac23d075a53284f80f28836d98f8d743958658ad Mon Sep 17 00:00:00 2001 From: 10002327 Date: Wed, 6 Nov 2024 10:40:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?EBOM=E5=B7=A5=E4=BD=9C=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=AD=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=8A=B6=E6=80=81=E6=98=AF=E5=90=A6=E4=B8=BA?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=8A=B6=E6=80=81=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 7 +++++-- .../product/bomnew/service/BomNewPbomParentService.java | 2 +- 2 files changed, 6 insertions(+), 3 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 61b5fee7..217c44f0 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 @@ -451,8 +451,9 @@ public class BomNewEbomParentService extends ServiceImpl= EBomStatusEnum.PUBLISHED.getValue()).throwMessage("发布PBOM之后，不能再删除~"); LogRecordContext.putVariable("bom", parent); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 4381b257..0269ba6b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -494,7 +494,7 @@ public class BomNewPbomParentService extends ServiceImpl= EBomStatusEnum.PUBLISHED.getValue()) { + if (type == 0 && child.getStatus() != null && child.getStatus() >= EBomStatusEnum.PUBLISHED.getValue()) { child.setStatus(PBomStatusEnum.BORROWED_PARTS.getValue()); } } From a5d7c025b123d3162135fce7bef54ebfebd80ca4 Mon Sep 17 00:00:00 2001 From: 10002327 Date: Wed, 6 Nov 2024 16:59:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?EBOM=E6=AD=A3=E5=BC=8F=E8=A1=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E4=B8=8ESAP=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/master/BomNewEbomParentMapper.xml | 1 - 1 file changed, 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 10ea7915..84472853 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 @@ -598,7 +598,6 @@ SELECT *, row_id AS bomRowId FROM t_bom_new_ebom_parent WHERE status = 4 - AND (root_is = 1 OR user_root_is = 1) AND sap_state > 3 AND created_by = #{userCode} From f6afff1bfbfacf2a70ae8b8e7719df1ab07cfa83 Mon Sep 17 00:00:00 2001 From: 10002327 Date: Wed, 6 Nov 2024 17:01:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?T=E9=A1=B9=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=92=8C11=E7=B1=BB=E4=B8=80=E6=A0=B7=EF=BC=8C=E9=83=BD?= =?UTF-8?q?=E6=98=AFB00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewPbomParentService.java | 6 ++++-- .../nflg/product/bomnew/service/ForwardReportService.java | 6 ++++-- .../bomnew/service/domain/EBom/EBomForwardReport.java | 6 +++--- .../bomnew/service/domain/PBom/PBomForwardReport.java | 6 +++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 0269ba6b..45ba7a93 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -402,7 +402,8 @@ public class BomNewPbomParentService extends ServiceImpl{ item.setBomVersion(parentFormal.getCurrentVersion()); // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 - if(MaterialshouldBomExistUtil.checkNoNeedBom(item)){ + if(MaterialshouldBomExistUtil.checkNoNeedBom(item) || Objects.equals("T",item.getProjectType())){ item.setCurrentVersion(OriginalConstant.NO_NEED_BOM); } }); @@ -521,7 +521,7 @@ public class PBomForwardReport extends BaseForwardReport { // vo.setCreatedTime(parentFormal.getCreatedTime()); // vo.setExpireEndTime(parentFormal.getReleaseTime()); // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 - if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){ vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); } } @@ -561,7 +561,7 @@ public class PBomForwardReport extends BaseForwardReport { // vo.setLevelNum(1); vo.setOrderNumber(orderNum.incrementAndGet() + ""); // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 - if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){ vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); } } From 6995b568ca3509f4cec550b8e7bbc0996eab626e Mon Sep 17 00:00:00 2001 From: 10002327 Date: Thu, 7 Nov 2024 11:45:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4BOM=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 217c44f0..fa6d5736 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 @@ -3213,7 +3213,11 @@ public class BomNewEbomParentService extends ServiceImpl= EBomStatusEnum.PUBLISHED.getValue()).throwMessage("发布PBOM之后，不能再删除~");