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) {