From b62afa654a31c5191f3e8dccb4d6d028a8ca53fd Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 8 Aug 2025 10:42:21 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=20-=20=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=90=AB=E6=9C=89=E7=89=B9=E6=AE=8A=E7=AC=A6?=
 =?UTF-8?q?=E5=8F=B7=20=E4=B8=8D=E5=85=81=E8=AE=B8=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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, "运单号重复");