From fa7435e95b6ada76179f9b495f1eeaa163f53a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 14 Mar 2024 09:36:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=8C=85=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/material/pojo/vo/AdSyncSetInfoVO.java | 1 - .../nflg/product/material/pojo/vo/ExcelDictionariesApiVO.java | 1 - 2 files changed, 2 deletions(-) diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/AdSyncSetInfoVO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/AdSyncSetInfoVO.java index fe12ca6f..7edc5b1d 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/AdSyncSetInfoVO.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/AdSyncSetInfoVO.java @@ -1,6 +1,5 @@ package com.nflg.product.material.pojo.vo; -import jdk.nashorn.internal.objects.annotations.Constructor; import lombok.Data; /** diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/ExcelDictionariesApiVO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/ExcelDictionariesApiVO.java index 3588c8d5..44715a6f 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/ExcelDictionariesApiVO.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/ExcelDictionariesApiVO.java @@ -1,6 +1,5 @@ package com.nflg.product.material.pojo.vo; -import jdk.nashorn.internal.objects.annotations.Constructor; import lombok.AllArgsConstructor; import lombok.Data; import org.ttzero.excel.annotation.ExcelColumn; From f92ac3be80586e25faa7832bfabcf39f9d75aee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 14 Mar 2024 09:37:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=B6=E8=BF=94=E5=9B=9E=E7=9A=84=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=98=AF404=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/BaseGlobalExceptionHandle.java | 82 ++++++++++++------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java index d773176d..80b0fa39 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java @@ -1,17 +1,18 @@ package com.nflg.product.base.core.exception; -import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; import nflg.product.common.constant.STATE; import nflg.product.common.vo.ResultVO; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DuplicateKeyException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MaxUploadSizeExceededException; import org.springframework.web.servlet.NoHandlerFoundException; @@ -33,31 +34,35 @@ public class BaseGlobalExceptionHandle { */ @ExceptionHandler(value = NflgBusinessException.class) @ResponseBody - public ResultVO handleJeecgBootException(NflgBusinessException e) { - return ResultVO.error(e.getState(), e.getMessage()); - + public ResponseEntity> handleJeecgBootException(NflgBusinessException e) { + log.error(e.getMessage(), e); + //return ResultVO.error(e.getState(), e.getMessage()); + return errorResult(e.getState(),e.getMessage()); } @ExceptionHandler(value = NoHandlerFoundException.class) @ResponseBody - public ResultVO handlerNoFoundException(NoHandlerFoundException e) { + public ResponseEntity> handlerNoFoundException(NoHandlerFoundException e) { log.error(e.getMessage(), e); - return ResultVO.error(404, "路径不存在，请检查路径是否正确"); + //return ResultVO.error(404, "路径不存在，请检查路径是否正确"); + return errorResult(STATE.AddressNotFound,"路径不存在，请检查路径是否正确"); } @ExceptionHandler(value = DuplicateKeyException.class) @ResponseBody - public ResultVO handleDuplicateKeyException(DuplicateKeyException e) { + public ResponseEntity> handleDuplicateKeyException(DuplicateKeyException e) { log.error(e.getMessage(), e); - return ResultVO.error("已存在该记录，请勿重复操作"); + //return ResultVO.error("已存在该记录，请勿重复操作"); + return errorResult("已存在该记录，请勿重复操作"); } @ExceptionHandler(value = Exception.class) @ResponseBody - public ResultVO handleException(Exception e) { + public ResponseEntity> handleException(Exception e) { log.error(e.getMessage(), e); - return ResultVO.error("操作失败，请联系系统管理员"); + //return ResultVO.error("操作失败，请联系系统管理员"); + return errorResult("操作失败，请联系系统管理员"); } /** @@ -67,8 +72,9 @@ public class BaseGlobalExceptionHandle { */ @ExceptionHandler(value = HttpRequestMethodNotSupportedException.class) @ResponseBody - public ResultVO HttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) { - StringBuffer sb = new StringBuffer(); + public ResponseEntity> HttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) { + log.error(e.getMessage(), e); + StringBuilder sb = new StringBuilder(); sb.append("不支持"); sb.append(e.getMethod()); sb.append("请求方法，"); @@ -81,8 +87,8 @@ public class BaseGlobalExceptionHandle { } } log.error(sb.toString(), e); - return ResultVO.error(STATE.PermissionDenied, "登录已过期，请重新登录"); -// return ResultVO.error(STATE.PermissionDenied, sb.toString()); + //return ResultVO.error(STATE.PermissionDenied, "登录已过期，请重新登录"); + return errorResult(STATE.PermissionDenied,"不支持的请求方法："+e.getMethod()); } /** @@ -90,53 +96,69 @@ public class BaseGlobalExceptionHandle { */ @ExceptionHandler(value = MaxUploadSizeExceededException.class) @ResponseBody - public ResultVO handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { + public ResponseEntity> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { log.error(e.getMessage(), e); - return ResultVO.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); + //return ResultVO.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); + return errorResult("文件大小超出10MB限制, 请压缩或降低文件质量! "); } @ExceptionHandler(value = DataIntegrityViolationException.class) @ResponseBody - public ResultVO handleDataIntegrityViolationException(DataIntegrityViolationException e) { + public ResponseEntity> handleDataIntegrityViolationException(DataIntegrityViolationException e) { log.error(e.getMessage(), e); - return ResultVO.error("字段太长,超出数据库字段的长度"); +// return ResultVO.error("字段太长,超出数据库字段的长度"); + return errorResult("字段太长,超出数据库字段的长度"); } @ExceptionHandler(value = SQLException.class) @ResponseBody - public ResultVO handleSQLException(SQLException e) { + public ResponseEntity> handleSQLException(SQLException e) { log.error(e.getMessage(),e); - return ResultVO.error("sql执行过程出现错误"); + //return ResultVO.error("sql执行过程出现错误"); + return errorResult("sql执行过程出现错误"); } @ExceptionHandler(value = RuntimeException.class) @ResponseBody - public ResultVO handleRuntimeExceptionException(RuntimeException e) { + public ResponseEntity> handleRuntimeExceptionException(RuntimeException e) { log.error(e.getMessage(),e); - throw new NflgBusinessException(STATE.Error, "系统错误,请联系管理员"); + //throw new NflgBusinessException(STATE.Error, "系统错误,请联系管理员"); + return errorResult("系统错误,请联系管理员"); } @ExceptionHandler(value = BadSqlGrammarException.class) @ResponseBody - public ResultVO handleDataAccessException(BadSqlGrammarException e) { + public ResponseEntity> handleDataAccessException(BadSqlGrammarException e) { log.error(e.getMessage(),e); - throw new NflgBusinessException(STATE.Error, "sql 语法错误，系统错误,请联系管理员"); + //throw new NflgBusinessException(STATE.Error, "sql 语法错误，系统错误,请联系管理员"); + return errorResult("sql 语法错误，系统错误,请联系管理员"); } @ExceptionHandler(value = MethodArgumentNotValidException.class) @ResponseBody - public ResultVO handleMethodArgumentException(MethodArgumentNotValidException e){ + public ResponseEntity> handleMethodArgumentException(MethodArgumentNotValidException e){ log.error(e.getMessage(),e); - return ResultVO.error(e.getBindingResult().getFieldError().getDefaultMessage()) ; + return errorResult(e.getBindingResult().getFieldError().getDefaultMessage()) ; } @ExceptionHandler(NullPointerException.class) - public ResultVO handleNullPointerException(NullPointerException ex) { - - return ResultVO.error(STATE.Error, "系统错误,请联系管理员:"+ex.getMessage()) ; + public ResponseEntity> handleNullPointerException(NullPointerException ex) { + log.error(ex.getMessage(),ex); + return errorResult(STATE.Error, "系统错误,请联系管理员:"+ex.getMessage()) ; } + @ExceptionHandler(MissingServletRequestParameterException.class) + public ResponseEntity> handleMissingServletRequestParameterException(MissingServletRequestParameterException ex) { + log.error(ex.getMessage(),ex); + return errorResult(STATE.ParamErr, ex.getParameterName()+"参数不能为空"); + } + private static ResponseEntity> errorResult(String msg) { + return ResponseEntity.status(HttpStatus.OK).body(ResultVO.error(STATE.Error,msg)); + } + private static ResponseEntity> errorResult(STATE code,String msg) { + return ResponseEntity.status(HttpStatus.OK).body(ResultVO.error(code,msg)); + } } From f859141de89611daeedac091ea51986c3d34b9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 14 Mar 2024 11:23:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=B6=E8=BF=94=E5=9B=9E=E7=9A=84=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=98=AF404=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/BaseGlobalExceptionHandle.java | 65 ++++++++----------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java index 80b0fa39..8348eea3 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java @@ -5,8 +5,6 @@ import nflg.product.common.constant.STATE; import nflg.product.common.vo.ResultVO; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DuplicateKeyException; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -34,35 +32,35 @@ public class BaseGlobalExceptionHandle { */ @ExceptionHandler(value = NflgBusinessException.class) @ResponseBody - public ResponseEntity> handleJeecgBootException(NflgBusinessException e) { + public ResultVO handleJeecgBootException(NflgBusinessException e) { log.error(e.getMessage(), e); //return ResultVO.error(e.getState(), e.getMessage()); - return errorResult(e.getState(),e.getMessage()); + return ResultVO.error(e.getState(),e.getMessage()); } @ExceptionHandler(value = NoHandlerFoundException.class) @ResponseBody - public ResponseEntity> handlerNoFoundException(NoHandlerFoundException e) { + public ResultVO handlerNoFoundException(NoHandlerFoundException e) { log.error(e.getMessage(), e); //return ResultVO.error(404, "路径不存在，请检查路径是否正确"); - return errorResult(STATE.AddressNotFound,"路径不存在，请检查路径是否正确"); + return ResultVO.error(STATE.AddressNotFound,"路径不存在，请检查路径是否正确"); } @ExceptionHandler(value = DuplicateKeyException.class) @ResponseBody - public ResponseEntity> handleDuplicateKeyException(DuplicateKeyException e) { + public ResultVO handleDuplicateKeyException(DuplicateKeyException e) { log.error(e.getMessage(), e); //return ResultVO.error("已存在该记录，请勿重复操作"); - return errorResult("已存在该记录，请勿重复操作"); + return ResultVO.error("已存在该记录，请勿重复操作"); } @ExceptionHandler(value = Exception.class) @ResponseBody - public ResponseEntity> handleException(Exception e) { + public ResultVO handleException(Exception e) { log.error(e.getMessage(), e); //return ResultVO.error("操作失败，请联系系统管理员"); - return errorResult("操作失败，请联系系统管理员"); + return ResultVO.error("操作失败，请联系系统管理员"); } /** @@ -72,7 +70,7 @@ public class BaseGlobalExceptionHandle { */ @ExceptionHandler(value = HttpRequestMethodNotSupportedException.class) @ResponseBody - public ResponseEntity> HttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) { + public ResultVO HttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) { log.error(e.getMessage(), e); StringBuilder sb = new StringBuilder(); sb.append("不支持"); @@ -88,7 +86,7 @@ public class BaseGlobalExceptionHandle { } log.error(sb.toString(), e); //return ResultVO.error(STATE.PermissionDenied, "登录已过期，请重新登录"); - return errorResult(STATE.PermissionDenied,"不支持的请求方法："+e.getMethod()); + return ResultVO.error(STATE.PermissionDenied,"不支持的请求方法："+e.getMethod()); } /** @@ -96,69 +94,62 @@ public class BaseGlobalExceptionHandle { */ @ExceptionHandler(value = MaxUploadSizeExceededException.class) @ResponseBody - public ResponseEntity> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { + public ResultVO handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { log.error(e.getMessage(), e); //return ResultVO.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); - return errorResult("文件大小超出10MB限制, 请压缩或降低文件质量! "); + return ResultVO.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); } @ExceptionHandler(value = DataIntegrityViolationException.class) @ResponseBody - public ResponseEntity> handleDataIntegrityViolationException(DataIntegrityViolationException e) { + public ResultVO handleDataIntegrityViolationException(DataIntegrityViolationException e) { log.error(e.getMessage(), e); // return ResultVO.error("字段太长,超出数据库字段的长度"); - return errorResult("字段太长,超出数据库字段的长度"); + return ResultVO.error("字段太长,超出数据库字段的长度"); } @ExceptionHandler(value = SQLException.class) @ResponseBody - public ResponseEntity> handleSQLException(SQLException e) { + public ResultVO handleSQLException(SQLException e) { log.error(e.getMessage(),e); //return ResultVO.error("sql执行过程出现错误"); - return errorResult("sql执行过程出现错误"); + return ResultVO.error("sql执行过程出现错误"); } @ExceptionHandler(value = RuntimeException.class) @ResponseBody - public ResponseEntity> handleRuntimeExceptionException(RuntimeException e) { + public ResultVO handleRuntimeExceptionException(RuntimeException e) { log.error(e.getMessage(),e); //throw new NflgBusinessException(STATE.Error, "系统错误,请联系管理员"); - return errorResult("系统错误,请联系管理员"); + return ResultVO.error("系统错误,请联系管理员"); } - - @ExceptionHandler(value = BadSqlGrammarException.class) @ResponseBody - public ResponseEntity> handleDataAccessException(BadSqlGrammarException e) { + public ResultVO handleDataAccessException(BadSqlGrammarException e) { log.error(e.getMessage(),e); //throw new NflgBusinessException(STATE.Error, "sql 语法错误，系统错误,请联系管理员"); - return errorResult("sql 语法错误，系统错误,请联系管理员"); + return ResultVO.error("sql 语法错误，系统错误,请联系管理员"); } @ExceptionHandler(value = MethodArgumentNotValidException.class) @ResponseBody - public ResponseEntity> handleMethodArgumentException(MethodArgumentNotValidException e){ + public ResultVO handleMethodArgumentException(MethodArgumentNotValidException e){ log.error(e.getMessage(),e); - return errorResult(e.getBindingResult().getFieldError().getDefaultMessage()) ; + return ResultVO.error(e.getBindingResult().getFieldError().getDefaultMessage()) ; } @ExceptionHandler(NullPointerException.class) - public ResponseEntity> handleNullPointerException(NullPointerException ex) { + @ResponseBody + public ResultVO handleNullPointerException(NullPointerException ex) { log.error(ex.getMessage(),ex); - return errorResult(STATE.Error, "系统错误,请联系管理员:"+ex.getMessage()) ; + return ResultVO.error(STATE.Error, "系统错误,请联系管理员") ; } @ExceptionHandler(MissingServletRequestParameterException.class) - public ResponseEntity> handleMissingServletRequestParameterException(MissingServletRequestParameterException ex) { + @ResponseBody + public ResultVO handleMissingServletRequestParameterException(MissingServletRequestParameterException ex) { log.error(ex.getMessage(),ex); - return errorResult(STATE.ParamErr, ex.getParameterName()+"参数不能为空"); - } - - private static ResponseEntity> errorResult(String msg) { - return ResponseEntity.status(HttpStatus.OK).body(ResultVO.error(STATE.Error,msg)); - } - private static ResponseEntity> errorResult(STATE code,String msg) { - return ResponseEntity.status(HttpStatus.OK).body(ResultVO.error(code,msg)); + return ResultVO.error(STATE.ParamErr, ex.getParameterName()+"参数不能为空"); } } From a4c4facf3152084ae4bbb23e64752a3ff023c3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 14 Mar 2024 14:28:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=8Eexcel=E5=AF=BC=E5=85=A5=E5=8E=9F?= =?UTF-8?q?=E5=A7=8Bbom=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E5=8F=B7=E6=98=AF=E2=80=9D=E6=97=A0=E2=80=9C?= =?UTF-8?q?=E5=88=99=E6=94=B9=E4=B8=BA=E2=80=9D=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewOriginalParentService.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index 8a726401..4ce3ab3e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java @@ -10,27 +10,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Sets; import com.mzt.logapi.context.LogRecordContext; -import com.nflg.product.base.core.config.SpringContextUtils; 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.mapper.master.BomNewOriginalParentMapper; import com.nflg.product.bomnew.pojo.dto.BomNewOriginalExcelDTO; import com.nflg.product.bomnew.pojo.dto.OriginalSaveBomDTO; -import com.nflg.product.bomnew.pojo.entity.*; +import com.nflg.product.bomnew.pojo.entity.BomNewOriginalChildEntity; +import com.nflg.product.bomnew.pojo.entity.BomNewOriginalMaterialUseEntity; +import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity; +import com.nflg.product.bomnew.pojo.entity.BomOriginalCadParentEntity; import com.nflg.product.bomnew.pojo.query.OriginalBomQuery; -import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO; import com.nflg.product.bomnew.pojo.vo.ImportOriginalBomVO; -import com.nflg.product.bomnew.service.domain.EBom.CheckEBomException; import com.nflg.product.bomnew.service.domain.OriginalBom.OriginalBomDetailTask; import com.nflg.product.bomnew.service.domain.OriginalBom.OriginalBomToEBomConvert; import com.nflg.product.bomnew.service.domain.OriginalBom.PlmBomToOriginalConvert; import com.nflg.product.bomnew.util.*; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.map.LinkedMap; -import org.bouncycastle.cert.dane.DANEEntry; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; @@ -46,7 +43,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinTask; import java.util.stream.Collectors; -import java.util.stream.Stream; /** @@ -618,6 +614,9 @@ public class BomNewOriginalParentService extends ServiceImpl Date: Thu, 14 Mar 2024 14:29:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=8Ecad=E5=AF=BC=E5=85=A5=E5=8E=9F?= =?UTF-8?q?=E5=A7=8Bbom=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=88=B6?= =?UTF-8?q?=E7=BA=A7=E7=89=A9=E6=96=99=E7=BC=96=E5=8F=B7=E6=98=AF=E2=80=9D?= =?UTF-8?q?=E6=97=A0=E2=80=9C=E5=88=99=E4=BB=8E=E4=B8=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/domain/OriginalBom/PlmBomToOriginalConvert.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/domain/OriginalBom/PlmBomToOriginalConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java index 030a824e..fa783287 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 @@ -49,7 +49,7 @@ public class PlmBomToOriginalConvert extends BaseConvert { childs = Convert.toList(BomOriginalPlmBomVO.class, SpringUtil.getBean(BomOriginalCadChildService.class).lambdaQuery().eq(BomOriginalCadChildEntity::getParentRowId, inParent.getRowId()).list()); parent = Convert.convert(BomOriginalPlmBomVO.class, inParent); //图号-初始化缺编码的物料 - if(StrUtil.isBlank(parent.getMaterialNo())){ + if(StrUtil.isBlank(parent.getMaterialNo()) || parent.getMaterialNo().trim().equalsIgnoreCase("无")){ SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(ImmutableList.of(parent) ,BomOriginalPlmBomVO::getDrawingNo,BomOriginalPlmBomVO::setMaterialNo,BomOriginalPlmBomVO::setMaterialName); } List noMaterialNoList = childs.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList());