From ec740af2c8de35134bf50b4a22963f8a1a150a0f Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 16 Sep 2025 17:36:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20TMS-=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=BD=AC=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=A4=84=E7=90=86=E5=8E=86=E5=8F=B2=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E6=95=B0=E6=8D=AE=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=BF=AB=E9=80=92100=E5=91=8A=E8=AD=A6=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20TMS-=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86-=E8=BD=AC?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=BD=AC?=
 =?UTF-8?q?=E4=BB=B6-=E6=A0=A1=E9=AA=8C=E8=BD=AC=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=AA=E5=85=81=E8=AE=B8=E5=A1=AB=E5=86=99=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../erp/web/emis/EmisWaybillTransferController.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
index 366e23748..1357359cb 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
@@ -1,11 +1,11 @@
 
-/** 
+/**
   * @Project: emis
   * @Title: EmisWaybillTransferController.java
   * @author linfso
   * @date 2024-05-22 01:07:48
   * @Copyright: ShangHai Duta 2022 All rights reserved.
-  * @version v1.0  
+  * @version v1.0
   * @Description: <p> 运单转件表 控制器 </p>
  */
 
@@ -50,7 +50,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillTransferService;
 
 /**
  * 运单转件表Controller
- * 
+ *
  * @author linfso
  * @date 2024-05-22 01:07:48
  */
@@ -151,6 +151,12 @@ public class EmisWaybillTransferController extends EmisBaseController
                 return AjaxResult.error(" 运单号,转件单号,转件时间,目的城市,转件公司必填!");
             }
 
+        // 校验转单号格式：只允许英文和数字
+        String transferBillCode = emisWaybillTransfer.getTransferBillCode();
+        if (StringUtils.isNotEmpty(transferBillCode) && !transferBillCode.matches("^[a-zA-Z0-9]+$")) {
+            return AjaxResult.error("转单号只允许填写英文和数字!");
+        }
+
 //        int ret=emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer);
         EmisWaybillTransfer query = new EmisWaybillTransfer();
         query.setBillCode(emisWaybillTransfer.getBillCode());

From 36ddc571b0f3c3ce6faa10a362ee7e1f6c1dd2d3 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 16 Sep 2025 18:03:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20TMS-=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=BD=AC=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=A4=84=E7=90=86=E5=8E=86=E5=8F=B2=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E6=95=B0=E6=8D=AE=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=BF=AB=E9=80=92100=E5=91=8A=E8=AD=A6=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20TMS-=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86-=E8=BD=AC?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=BD=AC?=
 =?UTF-8?q?=E4=BB=B6-=E6=A0=A1=E9=AA=8C=E8=BD=AC=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=AA=E5=85=81=E8=AE=B8=E5=A1=AB=E5=86=99=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E5=AD=97=EF=BC=8C=E9=95=BF=E5=BA=A66-32?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../erp/web/emis/EmisWaybillTransferController.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
index 1357359cb..34353fc5e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
@@ -151,10 +151,15 @@ public class EmisWaybillTransferController extends EmisBaseController
                 return AjaxResult.error(" 运单号,转件单号,转件时间,目的城市,转件公司必填!");
             }
 
-        // 校验转单号格式：只允许英文和数字
+        // 校验转单号格式：只允许英文和数字，长度6-32位
         String transferBillCode = emisWaybillTransfer.getTransferBillCode();
-        if (StringUtils.isNotEmpty(transferBillCode) && !transferBillCode.matches("^[a-zA-Z0-9]+$")) {
-            return AjaxResult.error("转单号只允许填写英文和数字!");
+        if (StringUtils.isNotEmpty(transferBillCode)) {
+            if (!transferBillCode.matches("^[a-zA-Z0-9]+$")) {
+                return AjaxResult.error("转单号只允许填写英文和数字!");
+            }
+            if (transferBillCode.length() < 6 || transferBillCode.length() > 32) {
+                return AjaxResult.error("转单号长度必须在6-32位之间!");
+            }
         }
 
 //        int ret=emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer);