From cacbdc0fc8c066c8c28f86616e074e6dfe7fa169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 29 May 2024 08:30:56 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat(pbom):=20=E4=BF=AE=E5=A4=8D=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=88=B0=E5=8A=9F=E8=83=BD=E7=8A=B6=E6=80=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewPbomParentService.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/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index fd431402..e6a9142d 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 @@ -568,7 +568,7 @@ public class BomNewPbomParentService extends ServiceImpl parent.getStatus()).throwMessage("只有已发布版本，才能复制"); VUtils.isTure(parent.getFacCode().equals(targetFacCode)).throwMessage("源工厂和目标工厂一致，无需复制"); VUtils.isTure(parent.getMaterialNo().startsWith("31")).throwMessage("31物料不能进行复制"); } From 1cb38690523d755ec422668041c1c86a6e91347b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 29 May 2024 11:42:38 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=88=B0sap=E7=9A=84=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ .../service/BomNewEbomParentService.java | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 405f68f5..ed97a662 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ target .idea logs +/ABAP_AS_WITH_POOL.jcoDestination +/dev_jco_rfc.trc 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 5c92ae98..4a9dae7a 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 @@ -976,24 +976,28 @@ public class BomNewEbomParentService extends ServiceImpl liErrMsg) { + bomNewSapErrorMsgService.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewSapErrorMsgEntity.class) + .eq(BomNewSapErrorMsgEntity::getTargetRowId, rootBomRowId)); + + if (CollUtil.isNotEmpty(liErrMsg)) { + BomNewSapErrorMsgEntity sapErrorMsgEntity = new BomNewSapErrorMsgEntity(); + sapErrorMsgEntity.setTargetRowId(rootBomRowId); + sapErrorMsgEntity.setType(0); + sapErrorMsgEntity.setData(JSON.toJSONString(liErrMsg)); + sapErrorMsgEntity.setCreatedName(SessionUtil.getRealName()); + sapErrorMsgEntity.setCreatedTime(LocalDateTime.now()); + bomNewSapErrorMsgService.saveOrUpdate(sapErrorMsgEntity); + } + } + private void updateSapState(Long rootBomRowId, SapStatusEnum sapState) { lambdaUpdate().eq(BomNewEbomParentEntity::getRowId, rootBomRowId) .set(BomNewEbomParentEntity::getSapTime, LocalDateTime.now()) From 207b1a6d44fb3e5f6ad5262296ae9bbd0e5f77a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 29 May 2024 15:38:10 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix(pbom):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=88=B0sap=E6=97=B6=EF=BC=8C=E5=8F=AA=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BA=86=E7=AC=AC=E4=B8=80=E5=B1=82=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 --- .../product/bomnew/service/BomNewPbomParentService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 e6a9142d..b7a58a5a 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 @@ -1117,7 +1117,11 @@ public class BomNewPbomParentService extends ServiceImpl t1s = new ArrayList<>(); @@ -1155,7 +1159,8 @@ public class BomNewPbomParentService extends ServiceImpl Date: Thu, 30 May 2024 08:47:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/TestApi.java | 71 +++++++++++++++++++ .../product/bomnew/pojo/vo/SystemInfoVO.java | 22 ++++++ 2 files changed, 93 insertions(+) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/SystemInfoVO.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java index f08ab8aa..a3afb24a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java @@ -2,13 +2,17 @@ package com.nflg.product.bomnew.api.user; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.RandomUtil; +import com.nflg.product.bomnew.client.MaterialMainClient; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO; import com.nflg.product.bomnew.pojo.vo.OperationErrorMsgVO; +import com.nflg.product.bomnew.pojo.vo.SystemInfoVO; import com.nflg.product.bomnew.service.SapOpUtilService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import nflg.product.common.vo.ResultVO; +import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -17,9 +21,18 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.attribute.FileTime; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; /** * @author 曹鹏飞 @@ -27,12 +40,21 @@ import java.util.List; */ @Api(tags = "测试功能用的接口") @RestController +@Slf4j @RequestMapping("test") public class TestApi { @Resource SapOpUtilService sapOpUtilService; + @Resource + private MaterialMainClient materialMainClient; + + @Resource + private Environment environment; + + private static SystemInfoVO SYSTEM_INFO_VO; + /** * sap接口测试 * @return @@ -74,4 +96,53 @@ public class TestApi { } return ResultVO.success(msgs); } + + /** + * 获取系统信息 + * @return + */ + @GetMapping("getSystemInfo") + @ApiOperation("获取系统信息") + public ResultVO getSystemInfo() { + if (Objects.isNull(SYSTEM_INFO_VO)) { + log.debug("spring.profiles.active：" + environment.getProperty("spring.profiles.active")); + switch (environment.getProperty("spring.profiles.active")) { + case "dev": + SYSTEM_INFO_VO = new SystemInfoVO(); + SYSTEM_INFO_VO.setActive("开 发 机"); + SYSTEM_INFO_VO.setVersion(getVersion()); + break; + case "test": + SYSTEM_INFO_VO = new SystemInfoVO(); + SYSTEM_INFO_VO.setActive("测 试 机"); + SYSTEM_INFO_VO.setVersion(getVersion()); + break; + } + } + + return ResultVO.success(SYSTEM_INFO_VO); + } + + private String getVersion() { + try { + // 获取当前 JAR 文件的路径 + // String jarPath = TestApi.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath(); + String jarPath = TestApi.class.getClassLoader().getResource("").toURI().getPath(); + log.debug("当前jar路径：" + jarPath); + // 转换为 Path 对象 + Path path = Paths.get(jarPath.substring(1)); + // 获取文件属性 + BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class); + // 获取创建时间 + FileTime creationTime = attr.creationTime(); + // 将 FileTime 转换为 LocalDateTime + LocalDateTime localDateTime = LocalDateTime.ofInstant(creationTime.toInstant(), ZoneId.systemDefault()); + // 定义日期格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + return localDateTime.format(formatter); + } catch (Exception e) { + log.error("获取jar信息失败", e); + return ""; + } + } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/SystemInfoVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/SystemInfoVO.java new file mode 100644 index 00000000..5c4731b6 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/SystemInfoVO.java @@ -0,0 +1,22 @@ +package com.nflg.product.bomnew.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * @author 曹鹏飞 + * @date 2024/5/29 11:46:12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "com-nflg-product-material-pojo-vo-SystemInfoVO") +public class SystemInfoVO { + + @ApiModelProperty("环境信息，开发机；测试机") + private String active; + + @ApiModelProperty("版本号") + private String version; +} 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 5/8] =?UTF-8?q?feat(ebom):=20=E8=B0=83=E6=95=B4sap?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=8A=B6=E6=80=81=E7=9A=84=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E9=A1=B9=EF=BC=9Bebom=E6=AD=A3=E5=BC=8F=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=89sap=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=B1=E8=B4=A5=E7=9A=84=EF=BC=8C=E5=88=99=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=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`) From 152c5c3ecf6fd2fb5168c88669ea66aa1ddb93de 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 11:15:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat(ebom):=20ebom=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B=E6=9C=AC?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=9A=84=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/pojo/entity/BomNewEbomParentEntity.java | 7 +++++++ .../product/bomnew/service/BomNewEbomParentService.java | 3 ++- .../nflg/product/bomnew/service/domain/EBom/EBomEdit.java | 1 + .../domain/OriginalBom/OriginalBomToEBomV2Convert.java | 1 + .../resources/mapper/master/BomNewEbomParentMapper.xml | 4 +++- .../nflg/product/base/core/conmon/util/SessionUtil.java | 4 ++++ 7 files changed, 19 insertions(+), 3 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 96f946c7..77cf2477 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 @@ -82,7 +82,7 @@ public interface BomNewEbomParentMapper extends BaseMapper getEBomParentByMaterialNos(@Param("job") Integer job, @Param("createdBy")String createdBy, @Param("materialNos") List materialNos); - Page workDetailsListByPageNew(Page objectPage, BomNewEbomParentQuery query, Integer userJob, String userCode); + Page workDetailsListByPageNew(Page objectPage, BomNewEbomParentQuery query, Integer userJob, String userCode, Long deptRowId); List getChildren(Long bomRowId, int type); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java index 7223ff50..e76f6f10 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java @@ -385,5 +385,12 @@ public class BomNewEbomParentEntity implements Serializable { @ApiModelProperty(value = "导入SAP时间") private LocalDateTime sapTime; + /** + * 创建人所属部门rowId + */ + @TableField(value = "dept_row_id") + @ApiModelProperty(value = "创建人所属部门rowId") + private Long deptRowId; + private static final long serialVersionUID = 265246823929418418L; } 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 d44f9357..c680215a 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 @@ -2224,7 +2224,8 @@ public class BomNewEbomParentService extends ServiceImpl result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage(), query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode()); + Page result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage() + , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId()); if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isBlank(query.getDrawingNo())) { //列表搜索 materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java index 43d6f828..83dd8ae8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java @@ -131,6 +131,7 @@ public class EBomEdit { parentEntity.setEditStatus(createDTO.getOpType()); parentEntity.setRootIs(parentEntity.getMaterialNo().startsWith("31") ? 1 : 0); parentEntity.setUserRootIs(1); + parentEntity.setDeptRowId(SessionUtil.getDepartRowId()); createDTO.getDatas().forEach(k -> { k.setParentRowId(parentEntity.getRowId()); 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 326411e6..1bb0148c 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 @@ -387,6 +387,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { this.eBomParentResult.add(ebom); } eBomParent.setMaterialOriginalUnit(eBomParent.getMaterialUnit()); + eBomParent.setDeptRowId(SessionUtil.getDepartRowId()); this.eBomParentResult.add(eBomParent); return eBomParent.getRowId(); 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 8359cd3c..68c9bc56 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 @@ -393,11 +393,13 @@ select * , row_id as bomRowId - from t_bom_new_pbom_parent where (root_is=1 or root_state=1 ) and status < 4 + from t_bom_new_pbom_parent where (root_is=1 or root_state=1 ) and status < 4 and dept_row_id = #{deptRowId} and fac_code=#{userFac} From 6c3ffb67419ca86788e15ff759592d0fc50ba6a0 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 17:03:42 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20ebom=E5=8E=BB=E9=99=A4sap=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=AD=97=E7=AC=A6=E4=B8=B2=EF=BC=9Bpbom=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0sap=E6=8E=92=E5=BA=8F=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/pojo/vo/BomNewEbomChildVO.java | 6 ------ .../product/bomnew/pojo/vo/BomNewEbomParentVO.java | 6 ------ .../product/bomnew/pojo/vo/BomNewPbomChildVO.java | 13 +++++++++---- .../product/bomnew/pojo/vo/BomNewPbomParentVO.java | 6 ++++++ .../bomnew/service/BomNewEbomParentService.java | 2 -- .../bomnew/service/BomNewPbomParentService.java | 2 ++ 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java index 5e68c638..9735d835 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java @@ -124,11 +124,5 @@ public class BomNewEbomChildVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "备注") private String remark; - /** - * SAP排序字符串 - */ - @ApiModelProperty(value = "SAP排序字符串") - private String sapOrderNum; - private static final long serialVersionUID = 1L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java index a0d160ee..9f4d0a78 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java @@ -341,12 +341,6 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "导入SAP状态") private Integer sapState; - /** - * SAP排序字符串 - */ - @ApiModelProperty(value = "SAP排序字符串") - private String sapOrderNum = "0040"; - private List childNodes = Collections.emptyList(); private static final long serialVersionUID = 1L; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomChildVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomChildVO.java index 9e074a62..4ae71887 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomChildVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomChildVO.java @@ -1,14 +1,13 @@ package com.nflg.product.bomnew.pojo.vo; -import java.math.BigDecimal; -import java.time.LocalDateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; import lombok.Data; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDate; /** * t_bom_new_pbom_child @@ -177,6 +176,12 @@ public class BomNewPbomChildVO implements Serializable { */ @ApiModelProperty(value = "来源行-父项物料编码") private String sourceParentMaterialNo; + + /** + * SAP排序字符串 + */ + @ApiModelProperty(value = "SAP排序字符串") + private String sapOrderNum; private static final long serialVersionUID = 1L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java index ed7fd4f7..3ef8b575 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java @@ -267,6 +267,12 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "导入SAP状态") private Integer sapState; + /** + * SAP排序字符串 + */ + @ApiModelProperty(value = "SAP排序字符串") + private String sapOrderNum = "0040"; + private String levelNo; 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 c680215a..cc5c6768 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 @@ -417,8 +417,6 @@ public class BomNewEbomParentService extends ServiceImpl