From 7061e032a961f611f307e33074db87eed541b7bd Mon Sep 17 00:00:00 2001 From: 10002327 Date: Thu, 22 Aug 2024 16:47:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?pbom=E5=8F=91=E8=B5=B7=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=8A=B6=E6=80=81=E4=BF=9D=E6=8C=81=E4=B8=8D?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java index a2a96724..99a2cbe6 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java @@ -98,7 +98,6 @@ public class PBomUpgrade { pbomParent.setTechnologyUserCode(SessionUtil.getUserCode()); pbomParent.setRemark(""); pbomParent.setSource(PbomSourceEnum.FROM_CHANGE.getValue()); - pbomParent.setSourceStatus(PbomSourceStatusEnum.PBOM.getValue()); pbomParent.setReleaseTime(null); pbomParent.setReleaseUserName(null); pbomParent.setSapState(1); @@ -135,7 +134,6 @@ public class PBomUpgrade { child.setCreatedBy(SessionUtil.getUserCode()); child.setModifyTime(null); child.setSource(PbomSourceEnum.FROM_CHANGE.getValue()); - child.setSourceStatus(PbomSourceStatusEnum.PBOM.getValue()); child.setRemark(""); this.childResult.add(child); } From ee18b73cfb89709b72bc62b45bf2add60ea28568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 22 Aug 2024 17:49:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?SET=20=E5=8D=95=E4=BD=8D=E4=B8=8D=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/domain/EBom/CheckEBomException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index fd166cfe..168c6560 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -138,7 +138,7 @@ public class CheckEBomException { && !Objects.equals(vo.getUserRootIs(), 1) && !Objects.equals(vo.getRootIsForWaitReview(), 1)) { vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_8.getValue()); } else if ((!StrUtil.equals("KG", StringUtil.toUpperCase(vo.getMaterialUnit())) - && !StrUtil.equals(StringUtil.toUpperCase(vo.getMaterialUnit()), "PC")) + && !StrUtil.equals(StringUtil.toUpperCase(vo.getMaterialUnit()), "PC") && !StrUtil.equals(StringUtil.toUpperCase(vo.getMaterialUnit()), "SET") ) && (StrUtil.isBlank(vo.getExceptionTag()) || (!vo.getExceptionTag().contains("16")) && !vo.getExceptionTag().contains("12")) && Objects.equals(vo.getSource(), EBomSourceEnum.FROM_BOM.getValue())) { vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_12.getValue()); From 544e4ef13faca4321a6f07db46d4d7d314e734b4 Mon Sep 17 00:00:00 2001 From: "BF-202309241046\\Administrator" Date: Thu, 22 Aug 2024 19:10:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?EBOM=20-pbom=20=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/constant/EBomConstant.java | 2 ++ .../nflg/product/bomnew/service/BomNewEbomParentService.java | 3 +++ .../nflg/product/bomnew/service/BomNewPbomParentService.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java index e8f22b8f..a1823dbd 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java @@ -23,6 +23,8 @@ public class EBomConstant { "materialName","materialDesc","drawingNo" }; + public static final String[] EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT3 = {"material", "materialTexture", "projectType", "materialUnit","materialWeight"}; + //集团总部代码 public static final String MAIN_FACTORY_CODE_1010="1010"; 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 b102b086..c7232e98 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 @@ -454,6 +454,9 @@ public class BomNewEbomParentService extends ServiceImpl Date: Thu, 22 Aug 2024 19:22:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?EBOM=20-pbom=20=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index f9cd629e..a7a32376 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -181,7 +181,7 @@ public abstract class EBomToPbomBase { //if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy())) { if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) { SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId())); - oldParent.setSourceRowId(parentVo.getRowId()); + oldParent.setSourceRowId(parentVo.getBomRowId()); oldParent.setCreatedTime(LocalDateTime.now()); oldParent.setCreatedBy(SessionUtil.getUserCode()); oldParent.setDeptName(SessionUtil.getDepartName()); From 434fc809faaa1ff63dd8bff33a6d5bb2425b0483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Fri, 23 Aug 2024 09:35:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?pbom-=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewPbomParentService.java | 1 + .../resources/mapper/master/BomNewPbomParentMapper.xml | 7 ++++--- 2 files changed, 5 insertions(+), 3 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 494bc378..5b3dca9e 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 @@ -377,6 +377,7 @@ public class BomNewPbomParentService extends ServiceImpl