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/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 9de727fa..daf2f24c 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 @@ -680,7 +680,7 @@ public class BomNewEbomParentService extends ServiceImpl ignoreCheckException) throws ExecutionException, InterruptedException { - CheckEBomException checkEBomException = new CheckEBomException(bomRowId); + CheckEBomException checkEBomException = new CheckEBomException(bomRowId, null); checkEBomException.initException(ignoreCheckException); //保存异常 @@ -733,7 +733,7 @@ public class BomNewEbomParentService extends ServiceImpl bomRowIds) { for (Long bomRowId : bomRowIds) { - CheckEBomException checkEBomException = new CheckEBomException(bomRowId); + CheckEBomException checkEBomException = new CheckEBomException(bomRowId, null); checkEBomException.initException(); //保存异常 @@ -767,6 +767,14 @@ public class BomNewEbomParentService 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/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java index de2d248e..5650258a 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 @@ -71,7 +71,7 @@ public class OptionalMbomMaterialService extends ServiceImpl 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()); 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) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index d9e42103..ba661860 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -9,9 +9,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.*; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; +import com.nflg.product.bomnew.service.BomNewEbomChildService; import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.MaterialMainService; import com.nflg.product.bomnew.util.*; @@ -52,7 +54,7 @@ public class CheckEBomException { } - public CheckEBomException(Long bomRowId) { + public CheckEBomException(Long bomRowId, Long childRowId) { allBomDetail = SpringUtil.getBean(BomNewEbomParentService.class).getBomTree(bomRowId, true); //只检查待复核和自己的 @@ -65,6 +67,13 @@ public class CheckEBomException { convert.setBomRowId(convert.getRowId()); convert.setParentRowId(0L); convert.setLevelNumber(BigDecimal.ZERO); + if (Objects.nonNull(childRowId) && childRowId > 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; 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 67838cae..ca03fb25 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 @@ -556,7 +556,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 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)