机台号[A-Za-z0-9]{1,5}
This commit is contained in:
parent
92c254a515
commit
ddb1db41ea
|
|
@ -50,12 +50,23 @@ public class PublishMaterialService {
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public ResultVO<String> publishWork(OptionalEbomPublishAddDTO optionalEbomPublishAddDTO) {
|
public ResultVO<String> 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<OptionalEbomImportChildVO> optionList = optionalEbomConfigService.getPreviewOptionList(optionalEbomPublishAddDTO.getRowId());
|
List<OptionalEbomImportChildVO> optionList = optionalEbomConfigService.getPreviewOptionList(optionalEbomPublishAddDTO.getRowId());
|
||||||
if (CollectionUtil.isEmpty(optionList)) {
|
if (CollectionUtil.isEmpty(optionList)) {
|
||||||
return ResultVO.error("发布未查询到物料数据");
|
return ResultVO.error("发布未查询到物料数据");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
OptionalEbomConfigEntity configEntity = SpringUtil.getBean(OptionalEbomConfigService.class).getById(optionalEbomPublishAddDTO.getRowId());
|
OptionalEbomConfigEntity configEntity = SpringUtil.getBean(OptionalEbomConfigService.class).getById(optionalEbomPublishAddDTO.getRowId());
|
||||||
|
|
||||||
if (configEntity == null) {
|
if (configEntity == null) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue