From f83fdd9770e4a5d78411f674755148cbbd01f94c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 30 May 2024 10:21:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E8=B0=83=E6=95=B4sap=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=8A=B6=E6=80=81=E7=9A=84=E6=9E=9A=E4=B8=BE=E9=A1=B9?= =?UTF-8?q?=EF=BC=9Bebom=E6=AD=A3=E5=BC=8F=E5=B7=A5=E4=BD=9C=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=89sap=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=EF=BC=8C=E5=88=99=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/constant/SapStatusEnum.java | 2 +- .../mapper/master/BomNewEbomParentMapper.java | 4 ++++ .../product/bomnew/pojo/vo/BomNewMbomMiddleVO.java | 4 ++-- .../bomnew/service/BomNewEbomParentService.java | 14 +++++++++----- .../bomnew/service/BomNewMbomDetailService.java | 2 +- .../bomnew/service/BomNewMbomParentService.java | 4 ++-- .../bomnew/service/BomNewPbomParentService.java | 2 +- .../nflg/product/bomnew/service/DQBomService.java | 2 +- .../service/OptionalMbomMaterialService.java | 2 +- .../service/domain/PBom/ConvertToMBomBase.java | 2 +- .../mapper/master/BomNewEbomParentMapper.xml | 14 ++++++++++++++ 11 files changed, 37 insertions(+), 15 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/SapStatusEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/SapStatusEnum.java index 7d253d92..c151ed36 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/SapStatusEnum.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/SapStatusEnum.java @@ -13,7 +13,7 @@ public enum SapStatusEnum implements ValueEnum { UNPUB_SAP(1, "未导入"), PUB_RUNNING(2, "导入中"), - PUB_SAP(3, "已导入"), + PUB_SUCCESS(3, "全部导入成功"), PUB_ERROR(4, "部分导入失败"), PUB_ERROR_ALL(5, "全部导入失败"); 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 8992d0a3..96f946c7 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 @@ -102,4 +102,8 @@ public interface BomNewEbomParentMapper extends BaseMapper parentRowIds); void delEBomHistory(@Param("parentRowIds") List parentRowIds); + + Page getSapErrorWorksheet(Page objectPage, String userCode); + + Integer getSapErrorNum(String userCode); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java index 5e37929d..4dc75c51 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java @@ -273,8 +273,8 @@ public class BomNewMbomMiddleVO extends BaseMaterialVO implements Serializable { public String getStatusName(){ if(materialBackStatus==null || materialBackStatus.equals(MBomConstantEnum.MaterialBackStatusEnum.APPLY_0.getValue())){ - if (SapStatusEnum.PUB_SAP.getValue().equals(status)) { - return SapStatusEnum.PUB_SAP.getDescription(); + if (SapStatusEnum.PUB_SUCCESS.getValue().equals(status)) { + return SapStatusEnum.PUB_SUCCESS.getDescription(); } return MBomConstantEnum.MaterialBackStatusEnum.APPLY_0.getDescription(); 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 4a9dae7a..d44f9357 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 @@ -309,9 +309,12 @@ public class BomNewEbomParentService extends ServiceImpl formalWorksheet(BomNewEbomParentQuery query) { - Page result = this.getBaseMapper().formalWorksheet(new Page<>(query.getPage(), query.getPageSize()), query, SessionUtil.getUserCode()); - - + Page result = new Page<>(); + if (StrUtil.equals(query.getMaterialNo(), "0")) { + result = this.getBaseMapper().getSapErrorWorksheet(new Page<>(query.getPage(), query.getPageSize()), SessionUtil.getUserCode()); + } else { + result = this.getBaseMapper().formalWorksheet(new Page<>(query.getPage(), query.getPageSize()), query, SessionUtil.getUserCode()); + } if (CollUtil.isNotEmpty(result.getRecords())) { materialMainService.intiMaterialInfo(result.getRecords()); } @@ -972,7 +975,7 @@ public class BomNewEbomParentService extends ServiceImpl getSapError(Long rowId) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomDetailService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomDetailService.java index a5365ca6..fdabc7df 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomDetailService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomDetailService.java @@ -89,7 +89,7 @@ public class BomNewMbomDetailService extends ServiceImpl formalListPage(BomNewMbomParentQuery query) { - query.setStatus(SapStatusEnum.PUB_SAP.getValue()); + query.setStatus(SapStatusEnum.PUB_SUCCESS.getValue()); List facCode= SpringUtil.getBean(UserRoleService.class).getUserOfFactory(); String code= StrUtil.join(",",facCode); query.setFacCode(code); @@ -306,7 +306,7 @@ public class BomNewMbomParentService extends ServiceImpl + + INSERT INTO `t_bom_new_ebom_parent_formal` (`row_id`, `batch_no`, `drawing_no`, `material_no`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `material_original_unit`, `unit_weight`, `total_weight`, `current_version`, `num`, `source`, `root_is`, `should_bom_exist`, `super_material_status`, `bom_exist`, `last_version_is`, `edit_status`, `status`, `user_root_is`, `virtrual_package_enum`, `exception_status`, `virtual_package_is`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `created_job`, `audit_time`, `audit_user_name`, `release_time`, `release_user_name`, `revert_time`, `revert_user_name`, `expire_end_time`, `convert_to_ebom_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `modify_time`, `sap_state`, `sap_time`)