From be9702a415eeb58a7a3427ef0ea464a37dd15daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 29 Apr 2024 11:32:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5sap=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?I=5FEMPNO=E5=AD=97=E6=AE=B5=EF=BC=8C=E8=A1=A8=E7=A4=BA=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 6 +----- .../product/bomnew/service/BomNewMbomParentService.java | 8 +------- .../product/bomnew/service/BomNewPbomParentService.java | 6 +----- .../com/nflg/product/bomnew/service/DQBomService.java | 7 +------ .../bomnew/service/OptionalMbomMaterialService.java | 7 +------ 5 files changed, 5 insertions(+), 29 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 457fb360..638a77e6 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 @@ -935,11 +935,7 @@ public class BomNewEbomParentService extends ServiceImpl t1s = new ArrayList<>(); buildChildrenForSap(root, t1s); sapDto.setT1(t1s); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java index c8d0b355..a7618012 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java @@ -10,7 +10,6 @@ import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.ImmutableList; -import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.BomConstant; import com.nflg.product.bomnew.constant.EBomConstant; import com.nflg.product.bomnew.constant.EBomSuperMaterialStatusEnum; @@ -23,7 +22,6 @@ import com.nflg.product.bomnew.pojo.entity.BomNewMbomParentEntity; import com.nflg.product.bomnew.pojo.query.BomNewMbomParentQuery; import com.nflg.product.bomnew.pojo.vo.BomNewMbomMiddleVO; import com.nflg.product.bomnew.pojo.vo.OperationErrorMsgVO; -import com.nflg.product.bomnew.pojo.vo.UserInfoVO; import com.nflg.product.bomnew.service.domain.MBom.IndexListTree; import com.nflg.product.bomnew.util.VUtils; import nflg.product.common.constant.STATE; @@ -273,11 +271,7 @@ public class BomNewMbomParentService extends ServiceImpl parentList=list.stream().filter(u -> u.getBomExist().intValue()>0).collect(Collectors.toList()); 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 32ced8fd..8617045c 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 @@ -1108,11 +1108,7 @@ public class BomNewPbomParentService extends ServiceImpl t1s = new ArrayList<>(); buildChildrenForSap(root, t1s); sapDto.setT1(t1s); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java index 0f31950a..6b2b0694 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.base.core.conmon.util.SessionUtil; -import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO; @@ -404,11 +403,7 @@ public class DQBomService { sapDto.setZID(RandomUtil.randomNumbers(5)); sapDto.setI_WERKS("1"); sapDto.setI_STLAN("1"); - UserInfoVO userInfoVO = SpringUtil.getBean(UserInfoService.class).getUserInfoByUserCode(root.getCreatedBy()); - if (Objects.isNull(userInfoVO)) { - throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("用户[{}]不存在", root.getCreatedBy())); - } - sapDto.setI_EMPNO(userInfoVO.getRealName()); + sapDto.setI_EMPNO(root.getCreatedBy()); List t1s = new ArrayList<>(); String dateYMD = DateUtil.format(new Date(), "yyyyMMdd"); datas.forEach(d -> { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java index 09577816..8e81d536 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java @@ -30,7 +30,6 @@ import com.nflg.product.bomnew.pojo.query.OptionalMbomMaterialListQuery; import com.nflg.product.bomnew.pojo.query.OptionalMbomMaterialQuery; import com.nflg.product.bomnew.pojo.vo.OperationErrorMsgVO; import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialListVO; -import com.nflg.product.bomnew.pojo.vo.UserInfoVO; import lombok.extern.slf4j.Slf4j; import nflg.product.common.constant.STATE; import nflg.product.common.vo.ResultVO; @@ -134,11 +133,7 @@ public class OptionalMbomMaterialService extends ServiceImpl