From 92c254a5155d27a36b6f0e62b3bffb03a5c06e14 Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 18 Jun 2024 13:14:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=BB=E7=89=A9?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/OptionalMbomMaterialService.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/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java index b97cd891..cb00693d 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 @@ -72,7 +72,7 @@ public class OptionalMbomMaterialService extends ServiceImpl Date: Tue, 18 Jun 2024 13:15:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E5=8F=B7[A-Za-z0-9]{1,5}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/aggreg/PublishMaterialService.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java index 3c6d56e7..f4fbf89d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java @@ -50,12 +50,23 @@ public class PublishMaterialService { @Transactional(rollbackFor = Exception.class) public ResultVO publishWork(OptionalEbomPublishAddDTO optionalEbomPublishAddDTO) { + + //check 机台格式 + optionalEbomPublishAddDTO.setMachineNo(optionalEbomPublishAddDTO.getMachineNo().toUpperCase()); + String machineNo=optionalEbomPublishAddDTO.getMachineNo(); + String regx="^[a-zA-Z0-9]{1,5}$"; + if(!machineNo.matches(regx)){ + return ResultVO.error("机台号包含范围a-zA-Z0-9，长度1-5位"); + } + + List optionList = optionalEbomConfigService.getPreviewOptionList(optionalEbomPublishAddDTO.getRowId()); if (CollectionUtil.isEmpty(optionList)) { return ResultVO.error("发布未查询到物料数据"); } + OptionalEbomConfigEntity configEntity = SpringUtil.getBean(OptionalEbomConfigService.class).getById(optionalEbomPublishAddDTO.getRowId()); if (configEntity == null) { From ea954836209e0e5abd51260aa70f09e0a99a197b Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 18 Jun 2024 15:10:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=20ebom=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=B8=BB=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/vo/OptionalEbomImportChildVO.java | 42 +++++++++---------- .../service/OptionalEbomConfigService.java | 10 ++++- .../OptionalEbomImportChildService.java | 6 ++- .../aggreg/AggregOptionConfigService.java | 3 ++ 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java index 61514ef5..23b68200 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @ApiModel("ebom选配件表") @Accessors(chain = true) -public class OptionalEbomImportChildVO implements Serializable { +public class OptionalEbomImportChildVO extends BaseMaterialVO { /** * 主键 */ @@ -36,26 +36,26 @@ public class OptionalEbomImportChildVO implements Serializable { */ @ApiModelProperty(value = "根节点id") private Long rootRowId; - /** - * 物料编码 - */ - @ApiModelProperty(value = "物料编码") - private String materialNo; - /** - * 物料名 - */ - @ApiModelProperty(value = "物料名") - private String materialName; - /** - * 物料描述 - */ - @ApiModelProperty(value = "物料描述") - private String materialDesc; - /** - * 图号 - */ - @ApiModelProperty(value = "图号") - private String drawingNo; +// /** +// * 物料编码 +// */ +// @ApiModelProperty(value = "物料编码") +// private String materialNo; +// /** +// * 物料名 +// */ +// @ApiModelProperty(value = "物料名") +// private String materialName; +// /** +// * 物料描述 +// */ +// @ApiModelProperty(value = "物料描述") +// private String materialDesc; +// /** +// * 图号 +// */ +// @ApiModelProperty(value = "图号") +// private String drawingNo; /** * 部件类型(1 单选 2 多选) */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java index cea1d55d..5bda39eb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java @@ -211,11 +211,17 @@ public class OptionalEbomConfigService extends ServiceImpl getTmpOptionList(Long rowId) { - return this.getBaseMapper().getTmpOptionList(rowId); + List list= this.getBaseMapper().getTmpOptionList(rowId); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list); + + return list; } public List getPreviewOptionList(Long rowId) { - return this.getBaseMapper().getPreviewOptionList(rowId); + List list= this.getBaseMapper().getPreviewOptionList(rowId); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list); + + return list; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java index 8ca721fa..2ad65441 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java @@ -48,7 +48,11 @@ public class OptionalEbomImportChildService extends ServiceImpl getByRootRowList(OptionalEbomImportChildQuery query) { - return getBaseMapper().getByRootRowList(query); + + List list= getBaseMapper().getByRootRowList(query); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list); + + return list; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java index f528e3ab..49aa3480 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java @@ -259,6 +259,9 @@ public class AggregOptionConfigService { tmpVo.setDeviceInfo(optionalEbomConfigVO); List listParent = optionalEbomImportService.getByRootIdList(optionalEbomConfigEntity.getParentRowId()); List listChild = optionalEbomConfigService.getBaseMapper().getTmpOptionInfoList(rowId); + + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(listChild); + OptionalEbomConfigAggregVO optionalEbomConfigAggregVO= filterTree(listParent,listChild); tmpVo.setSingleList(optionalEbomConfigAggregVO.getSingleList()); tmpVo.setMulList(optionalEbomConfigAggregVO.getMulList()); From 7dec2c11988cd97effdc7ebf63c75420ec2d48da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 18 Jun 2024 15:32:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?optimize(ebom):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/core/exception/BaseGlobalExceptionHandle.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 838f590e..114ccd6d 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 @@ -124,8 +124,11 @@ public class BaseGlobalExceptionHandle { @ResponseBody public ResultVO handleRuntimeExceptionException(RuntimeException e) { log.error(e.getMessage(),e); - //throw new NflgBusinessException(STATE.Error, "系统错误,请联系管理员"); - return ResultVO.error("系统错误,请联系管理员"); + if (StrUtil.isNotBlank(e.getMessage()) && e.getMessage().contains("Deadlock")) { + return ResultVO.error("操作失败，请重试"); + } else { + return ResultVO.error("系统错误,请联系管理员"); + } } @ExceptionHandler(value = BadSqlGrammarException.class) From 4a2e64a657fb8e51af1a450cd226d59c38f2f7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 18 Jun 2024 15:33:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(ebom):=20=E6=B7=BB=E5=8A=A0dept=5Frow?= =?UTF-8?q?=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/master/BomNewEbomParentMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6bab6f5a..745f6b03 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 @@ -526,7 +526,7 @@ a.`virtrual_package_enum`, a.`exception_status`, a.`virtual_package_is`, a.`source_row_id`, a.`devise_user_code`, a.`devise_name`, a.`created_by`, a.`created_time`, a.`created_job`, a.`audit_time`, a.`audit_user_name`, a.`release_time`, a.`release_user_name`, a.`revert_time`, a.`revert_user_name`, - a.`expire_end_time`, a.`convert_to_ebom_time`, a.`remark`, a.`dept_name`,`dept_row_id`, a.`level_num`, + a.`expire_end_time`, a.`convert_to_ebom_time`, a.`remark`, a.`dept_name`,a.`dept_row_id`, a.`level_num`, a.`change_desc`, a.`notice_nums`, a.`modify_time`, a.`sap_state`, a.`sap_time` from t_bom_new_ebom_parent a left join t_bom_new_ebom_parent_formal b on a.row_id = b.row_id From 0dc234ff71def86be8824a70a5be3c4a284f4ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 18 Jun 2024 15:35:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat(ebom):=20=E4=BF=AE=E5=A4=8D=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=A3=80=E6=9F=A5=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=A3=80=E6=9F=A5=E6=A0=B9=E8=8A=82=E7=82=B9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=A1=B9=E7=9B=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewEbomParentService.java | 18 +++++++++++++----- .../domain/EBom/CheckEBomException.java | 11 ++++++++++- 2 files changed, 23 insertions(+), 6 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 0785aff4..0b38ee77 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 @@ -678,7 +678,7 @@ public class BomNewEbomParentService extends ServiceImpl ignoreCheckException) throws ExecutionException, InterruptedException { - CheckEBomException checkEBomException = new CheckEBomException(bomRowId); + CheckEBomException checkEBomException = new CheckEBomException(bomRowId, null); checkEBomException.initException(ignoreCheckException); //保存异常 @@ -731,7 +731,7 @@ public class BomNewEbomParentService extends ServiceImpl bomRowIds) { for (Long bomRowId : bomRowIds) { - CheckEBomException checkEBomException = new CheckEBomException(bomRowId); + CheckEBomException checkEBomException = new CheckEBomException(bomRowId, null); checkEBomException.initException(); //保存异常 @@ -765,6 +765,14 @@ public class BomNewEbomParentService extends ServiceImpl 0) { + BomNewEbomChildEntity c = SpringUtil.getBean(BomNewEbomChildService.class).getById(childRowId); + if (Objects.nonNull(c)) { + convert.setProjectType(c.getProjectType()); + convert.setNum(c.getNum()); + } + } allBomDetail.add(convert); checkWaring=true;