From 430fbd127dabf8d0a591cabe2f95165d7d9df46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 23 May 2024 11:13:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/core/config/MybatisPlusHandler.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java index d07cb7fb..d1f039f6 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java @@ -20,22 +20,30 @@ public class MybatisPlusHandler implements MetaObjectHandler { public void insertFill(MetaObject metaObject) { this.strictInsertFill(metaObject, "createdBy", String.class, getUserName()); this.strictInsertFill(metaObject, "createdTime", LocalDateTime.class, LocalDateTime.now()); - this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName()); + this.strictInsertFill(metaObject, "updatedBy", String.class, getRealName()); this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now()); } @Override public void updateFill(MetaObject metaObject) { - this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName()); + this.strictInsertFill(metaObject, "updatedBy", String.class, getRealName()); this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now()); } - private String getUserName() { + private String getRealName() { try { return StrUtil.isNotBlank(SessionUtil.getRealName()) ? SessionUtil.getRealName() : SessionUtil.getUserName(); } catch (NflgBusinessException e) { return "admin"; } } + + private String getUserName() { + try { + return SessionUtil.getUserName(); + } catch (NflgBusinessException e) { + return "admin"; + } + } } From d8e8e60a9f80b7ba986a7b186c00e5aaea6b1c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 23 May 2024 11:29:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8D=E5=8F=8C?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BA=BA=E5=91=98=E6=97=A0=E6=B3=95=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E8=87=AA=E5=B7=B1=E5=88=9B=E5=BB=BA=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E5=A4=8D=E6=A0=B8=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/master/BomNewEbomParentMapper.xml | 3 ++- 1 file changed, 2 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 233bedd5..c9d8a6ae 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 @@ -403,7 +403,8 @@ created_by=#{userCode} - AND (root_is=1 OR user_root_is=1) AND status=2 + AND ((root_is=1 OR user_root_is=1) AND status=2) OR (status IN (1,3) AND (root_is=1 OR user_root_is=1 OR + root_is_for_wait_review=1) AND created_by=#{userCode}) AND (root_is=1 OR user_root_is=1) AND status=4 From a6726983030b50678bd61f106d285950857487fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 23 May 2024 11:44:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(ebom):=20=E4=BB=8Ecad=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E5=B9=B6=E8=BD=AC=E5=88=B0ebom?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF31=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E7=9A=84=EF=BC=8C=E8=AE=BE=E7=BD=AE=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E7=9A=84=E5=85=B3=E8=81=94=E7=BC=96=E5=8F=B7=E4=BB=A5=E4=BE=9B?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E7=94=9F=E6=88=90=E8=99=9A=E6=8B=9F=E5=8C=85?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OriginalBom/OriginalBomToEBomV2Convert.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java index 9d29bbf5..bf3332f8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java @@ -268,7 +268,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { } } - buildEBomChild(childVo, parentEntity.getEBomRowId()); + buildEBomChild(childVo, parentEntity); } } @@ -411,14 +411,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { } - private void buildEBomChild(BomOriginalListVO child, Long parentRowId) { + private void buildEBomChild(BomOriginalListVO child, BomOriginalListVO parent) { BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity(); BeanUtil.copyProperties(child, childEntity, "materialGetType"); childEntity.setRowId(IdWorker.getId()); - childEntity.setParentRowId(parentRowId); - childEntity.setIdentityNo(StrUtil.join("_", parentRowId.toString(), childEntity.getRowId())); + childEntity.setParentRowId(parent.getEBomRowId()); + childEntity.setIdentityNo(StrUtil.join("_", parent.getEBomRowId().toString(), childEntity.getRowId())); childEntity.setModifyTime(LocalDateTime.now()); childEntity.setSourceRowId(StrUtil.isNotBlank(child.getSourceRowId())?child.getSourceRowId(): child.getRowId().toString()); //当为原材料时，数量=总重 单位改为KG 图号=编码 @@ -428,6 +428,9 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { // childEntity.setDrawingNo(childEntity.getMaterialNo()); // } childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit()); + if (parent.getMaterialNo().startsWith("31")) { + childEntity.setVirtualPartRootMaterialNo(parent.getMaterialNo()); + } this.eBomChildResult.add(childEntity);