diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index c74e3c0a2..4638fd54e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -484,11 +484,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb public int draftSubmitOrder(EmisWaybill emisWaybillSave) throws EmisBizError { // 如果没有单号就生成单号,如果有单号需要判断是否重复 - if( !StringUtils.isEmpty(emisWaybillSave.getBillCode()) ) { + if (!StringUtils.isEmpty(emisWaybillSave.getBillCode())) { - String billCode=WaybillHelper.formatQueryValue(emisWaybillSave.getBillCode()); + String billCode = WaybillHelper.formatQueryValue(emisWaybillSave.getBillCode()); emisWaybillSave.setBillCode(billCode); + // 校验运单号不能包含特殊字符 + if (billCode.matches(".*[^a-zA-Z0-9\\-].*")) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "运单号不能包含特殊字符"); + } + boolean isExists = this.checkWaybillIsExists(emisWaybillSave.getBillCode()); if (isExists) { throw new EmisBizError(EmisBizErrorType.EXISTS, "运单号重复");