From eeb2e3fc3ce97b4ca690dcf7006658429ed3095f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 15 Mar 2024 11:31:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/service/UserInfoService.java | 2 +- .../domain/OriginalBom/PlmBomToOriginalConvert.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserInfoService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserInfoService.java index ca34b5ce..540495d4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserInfoService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserInfoService.java @@ -15,7 +15,7 @@ public class UserInfoService { @Resource MaterialMainService materialMainService; - public UserInfoVO getUserInfo(String userCode){ + public UserInfoVO getUserInfoByUserCode(String userCode){ return materialMainService.getBaseMapper().getUserInfoByUserCode(userCode); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java index 5b5b9e21..e8e39cbc 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java @@ -115,12 +115,11 @@ public class PlmBomToOriginalConvert extends BaseConvert { delBomChild(originalBom.getRowId()); handlerChild(originalBom,originalSourceEnum); } else { //用户不一致 + UserInfoVO userInfo =SpringUtil.getBean(UserInfoService.class).getUserInfoByUserCode(originalBom.getCreatedBy()); if (isSame(getBomChild(originalBom.getRowId()), Convert.toList(BomNewOriginalChildEntity.class, childs))) { - importErrorResult.add(new ImportOriginalBomVO(parent.getChartNo(),"BOM数据和" + originalBom.getCreatedBy() + "导入的数据不一致，请沟通处理")); - // VUtils.isTure(true).throwMessage("图号:"+parent.getChartNo()+"的BOM数据和" + originalBom.getCreatedBy() + "导入的数据不一致，请沟通处理"); + importErrorResult.add(new ImportOriginalBomVO(parent.getChartNo(),"BOM数据和" + userInfo.getRealName() + "("+userInfo.getUserCode()+")导入的数据不一致，请沟通处理")); } else { - importErrorResult.add(new ImportOriginalBomVO( parent.getChartNo(),originalBom.getCreatedBy() + "已导入了相同的BOM,直接引用")); - // VUtils.isTure(true).throwMessage("图号："+parent.getChartNo()+" "+originalBom.getCreatedBy() + "已导入了相同的BOM,直接引用"); + importErrorResult.add(new ImportOriginalBomVO( parent.getChartNo(),userInfo.getRealName() + "("+userInfo.getUserCode()+")已导入了相同的BOM,直接引用")); } } } @@ -134,7 +133,7 @@ public class PlmBomToOriginalConvert extends BaseConvert { // VUtils.isTure(true).throwMessage("图号:"+parent.getChartNo()+"此数据已创建BOM，请删除BOM重新导入"); } else { - UserInfoVO userInfo =SpringUtil.getBean(UserInfoService.class).getUserInfo(ebom.getCreatedBy()); + UserInfoVO userInfo =SpringUtil.getBean(UserInfoService.class).getUserInfoByUserCode(ebom.getCreatedBy()); importErrorResult.add(new ImportOriginalBomVO( parent.getChartNo(),"此数据已被"+userInfo.getRealName()+"("+userInfo.getUserCode()+")创建，请联系TA处理")); // VUtils.isTure(true).throwMessage("图号:"+parent.getChartNo()+"此数据已被其他用户创建，请联系其他人处理"); }